com.xd.sdk.account 7.1.1 → 7.2.0

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

@@ -4,6 +4,6 @@
 //
 //  Created by Fattycat on 2023/4/14.
 //
-#define XDGAccount_VERSION @"7.1.0"
-#define XDSAccount_VERSION_CODE @"7001000"
-// HASH 669fedcf
+#define XDGAccount_VERSION @"7.2.0"
+#define XDSAccount_VERSION_CODE @"7020000"
+// HASH 8d15387e

package/Runtime/Internal/Mobile/AccountFeaturesImpl.cs

@@ -171,7 +171,7 @@ namespace XD.SDK.Account.Internal.Mobile
                 }
                 catch (Exception e)
                 {
-                    XDGLogger.Warn("convert current user error" + e.Message);
+                    XDGLogger.Warn("convert current user error" + e.Message, XDGLoggerTag.Bridge);
                 }
             }
 
@@ -243,7 +243,7 @@ namespace XD.SDK.Account.Internal.Mobile
 
             EngineBridge.GetInstance().CallHandler(command, result =>
             {
-                XDGLogger.Debug("bindByType 方法结果: " + result.ToJson());
+                XDGLogger.Debug("bindByType 方法结果: " + result.ToJson(), XDGLoggerTag.Bridge);
 
                 var xdgError = result.Parse2XDGError();
                 if (xdgError != null)
@@ -299,27 +299,26 @@ namespace XD.SDK.Account.Internal.Mobile
             try
             {
                 var result = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TdsSDKGetUser);
-                var objectId = XDDictionary.GetValue<string>(result, "objectId");
+                var objectId = XDDictionary.GetValue<string>(result.GetValueOrThrow(), "objectId");
                 if (objectId == user.UserId)
                 {
                     return;
                 }
 
-                //TODO 同步之前先退登 TDSUser
                 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!");
+                    XDGLogger.Warn("[SyncTDSUser] sessionToken is Null!", XDGLoggerTag.Bridge);
                     return;
                 }
 
                 XDGEventBus.Publish(XDGEvents.TdsSDKSyncUser, sessionToken, user.UserId);
             }
-            catch (Exception e)
+            catch (XDGError e)
             {
-                XDGLogger.Warn($"[SyncTDSUser] error:{e.Message}");
+                XDGLogger.Warn($"[SyncTDSUser] error:{e.ErrorMsg}", XDGLoggerTag.Bridge);
             }
         }
 
@@ -329,11 +328,11 @@ namespace XD.SDK.Account.Internal.Mobile
             using (var accountBridgeClass = new AndroidJavaClass(BridgeConstants.Account.BridgeStaticImpl))
             {
                 var fbToken = accountBridgeClass.CallStatic<string>("getFacebookToken");
-                XDGLogger.Debug($"[GetFacebookToken] fbToken:{fbToken}");
+                XDGLogger.Debug($"[GetFacebookToken] fbToken:{fbToken}", XDGLoggerTag.Bridge);
                 var tokenDic = JsonConvert.DeserializeObject<Dictionary<string, object>>(fbToken);
                 if (tokenDic.ContainsKey("error"))
                 {
-                    XDGLogger.Warn($"[GetFacebookToken] error:{JsonConvert.SerializeObject(tokenDic)}");
+                    XDGLogger.Warn($"[GetFacebookToken] error:{JsonConvert.SerializeObject(tokenDic)}", XDGLoggerTag.Bridge);
                     return;
                 }
                 var token = XDDictionary.GetValue<string>(tokenDic, "access_token");

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

@@ -14,7 +14,7 @@ namespace XD.SDK.Account.Internal.Mobile
     {
         protected override async Task BeforeRequestAsync(IHttpRequest request, CancellationToken cancellationToken)
         {
-            XDGLogger.Debug($"[MacAuthenticationInterceptor] request Url: {JsonConvert.SerializeObject(request.Url)}");
+            XDGLogger.Debug($"[MacAuthenticationInterceptor] request Url: {JsonConvert.SerializeObject(request.Url)}", XDGLoggerTag.Http);
             
             var authDic = await GetMacToken(request.Url, request.Method);
             var authToken = "";
@@ -24,7 +24,7 @@ namespace XD.SDK.Account.Internal.Mobile
                 request.Headers["Authorization"] = authToken;
             }
 
-            XDGLogger.Debug($"[MacAuthenticationInterceptor] request Headers: {JsonConvert.SerializeObject(request.Headers)}");
+            XDGLogger.Debug($"[MacAuthenticationInterceptor] request Headers: {JsonConvert.SerializeObject(request.Headers)}", XDGLoggerTag.Http);
         }
 
         private static Task<Dictionary<string, string>> GetMacToken(string requestUrl, HttpMethod method)

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

@@ -51,7 +51,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
                 catch (Exception e)
                 {
-                    XDGLogger.Warn(e.Message);
+                    XDGLogger.Warn(e.Message, XDGLoggerTag.Account);
                 }
             }
         }

package/Runtime/Internal/Standalone/AccountFeaturesImpl.cs

@@ -88,7 +88,7 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (Exception e)
             {
-                XDGLogger.Error(new XDGError(ResponseCode.Common.Failed, e.Message));
+                XDGLogger.Error(new XDGError(ResponseCode.Common.Failed, e.Message), XDGLoggerTag.Account);
             }
         }
 
@@ -107,7 +107,7 @@ namespace XD.SDK.Account.Internal.Standalone
             var user = UserModule.current;
             if (user == null)
             {
-                XDGLogger.Warn("请先登录");
+                XDGLogger.Warn("请先登录", XDGLoggerTag.Account);
                 UIManager.ShowToast(XDLocalization.GetCurrentLocalizableString().NotLogin);
                 return;
             }
@@ -128,7 +128,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 var user = UserModule.current;
                 if (user == null)
                 {
-                    XDGLogger.Warn("请先登录");
+                    XDGLogger.Warn("请先登录", XDGLoggerTag.Account);
                     UIManager.ShowToast(XDLocalization.GetCurrentLocalizableString().NotLogin);
                     return;
                 }
@@ -148,7 +148,7 @@ namespace XD.SDK.Account.Internal.Standalone
                     };
                     var url = AuthConstants.CN_PERSONAL_INFO + UserModule.XDG_PERSONAL_INFO + "?" +
                               XDUrlUtils.ToQueryString(queries);
-                    
+
                     UIManager.ShowUI<XDWebViewAlert>("XDWebViewAlert", new Dictionary<string, object>
                     {
                         {
@@ -182,7 +182,7 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (Exception e)
             {
-                XDGLogger.Error(new XDGError(ResponseCode.Common.Failed, e.Message));
+                XDGLogger.Error(new XDGError(ResponseCode.Common.Failed, e.Message), XDGLoggerTag.Account);
             }
         }
 
@@ -194,7 +194,7 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (XDGError e)
             {
-                XDGLogger.Error(new XDGError(ResponseCode.Common.Failed, e.ErrorMsg));
+                XDGLogger.Error(new XDGError(ResponseCode.Common.Failed, e.ErrorMsg), XDGLoggerTag.Account);
             }
         }
 
@@ -245,7 +245,8 @@ namespace XD.SDK.Account.Internal.Standalone
                 // AliyunTrack.LoginAntiAddictionResult(XDDictionary.GetValue(complianceResult, "code", -100),
                 // XDDictionary.GetValue<string>(complianceResult, "reason"),
                 // XDDictionary.GetValue<string>(complianceResult, "extras"));
-                if (XDDictionary.GetValue<bool>(complianceResult, "success"))
+                var compliance = complianceResult.GetValueOrDefault();
+                if (XDDictionary.GetValue<bool>(compliance, "success"))
                 {
                     await AgreementModule.SignAgreement(user.UserId);
                     return user;
@@ -269,7 +270,15 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (Exception e)
             {
-                AliyunTrack.LoginFail(e.Message);
+                if (e is XDGError error)
+                {
+                    AliyunTrack.LoginFail(error.ErrorMsg);
+                }
+                else
+                {
+                    AliyunTrack.LoginFail(e.Message);
+                }
+
                 AgreementModule.ClearLocalSignedAgreements();
                 throw;
             }
@@ -279,7 +288,7 @@ namespace XD.SDK.Account.Internal.Standalone
         {
             // SDK 登陆成功
             AliyunTrack.LoginLogout(logoutType);
-            
+
             ClearUserCache();
 
             XDGEventBus.Publish(XDGEvents.TdsSDKLogout);
@@ -321,7 +330,7 @@ namespace XD.SDK.Account.Internal.Standalone
             var current = UserModule.current;
             if (current == null)
             {
-                XDGLogger.Warn("请先登录");
+                XDGLogger.Warn("请先登录", XDGLoggerTag.Account);
                 UIManager.ShowToast(XDLocalization.GetCurrentLocalizableString().NotLogin);
                 return;
             }
@@ -329,7 +338,7 @@ namespace XD.SDK.Account.Internal.Standalone
             string cancelUrl = ConfigModule.CancelUrl;
             if (string.IsNullOrEmpty(cancelUrl))
             {
-                XDGLogger.Warn("没有有效的注销 url");
+                XDGLogger.Warn("没有有效的注销 url", XDGLoggerTag.Account);
                 return;
             }
 
@@ -360,7 +369,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
 
                 var url = $"{cancelUrl}?{XDUrlUtils.ToQueryString(queryParams)}";
-                XDGLogger.Debug($"cancel url: {url}");
+                XDGLogger.Debug($"cancel url: {url}", XDGLoggerTag.Account);
 
                 // 打开内置浏览器
                 var data = new Dictionary<string, object>
@@ -390,7 +399,7 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (Exception e)
             {
-                XDGLogger.Warn($"[InvokeXdgPaymentCheckRefundStatusWithUI] Error:{e.Message}");
+                XDGLogger.Warn($"[InvokeXdgPaymentCheckRefundStatusWithUI] Error:{e.Message}", XDGLoggerTag.Account);
             }
 
             return user;

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

@@ -27,18 +27,11 @@ namespace XD.SDK.Account.Internal.Standalone
                     UIManager.ShowLoading(timeout: 3);
                 }
                 // 使用明确指定参数类型的反射调用
-                var permissions = ConfigModule.TapConfig.Permissions;
-                var authData = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKLogin, permissions);
-
-                // 检查返回结果是否为 null
-                if (authData == null)
-                {
-                    throw new XDGError(ResponseCode.Common.Failed, "TapTap 登录返回数据为空");
-                }
-
+                var permissions = ConfigModule.TapConfig?.Permissions;
+                var authDataResult = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKLogin, permissions);
+                var authData = authDataResult.GetValueOrThrow();
                 authData.Add("type", (int)LoginType.TapTap);
                 authData.Add("scope", string.Join(",", permissions?.ToArray()));
-                
                 if (ConfigModule.TapConfig != null && ConfigModule.UsingTapPC)
                 {
                     UIManager.DismissLoading();
@@ -50,21 +43,21 @@ namespace XD.SDK.Account.Internal.Standalone
             // {
             //     if (e.code == (int)TapErrorCode.ERROR_CODE_LOGIN_CANCEL)
             //     {
-            //         XDGLogger.Debug($"Tap 取消登录，{e}");
+            //         XDGLogger.Debug($"Tap 取消登录，{e}", XDGLoggerTag.Account);
             //         AliyunTrack.LoginAuthorizeFail(e.Message);
             //         throw XDGErrorExtensions.CancelledError(e.message);
             //     }
             //     else
             //     {
-            //         XDGLogger.Warn($"Tap 登录失败：{e}");
+            //         XDGLogger.Warn($"Tap 登录失败：{e}", XDGLoggerTag.Account);
             //         throw new XDGError(ResponseCode.Common.Failed, e.Message);
             //     }
             // }
-            catch (Exception e)
+            catch (XDGError e)
             {
-                AliyunTrack.LoginAuthorizeFail(e.Message);
-                XDGLogger.Warn($"Tap 登录失败：{e}");
-                throw new XDGError(ResponseCode.Common.Failed, e.Message);
+                AliyunTrack.LoginAuthorizeFail(e.ErrorMsg);
+                XDGLogger.Warn($"Tap 登录失败：{e.ErrorMsg}",XDGLoggerTag.Common);
+                throw new XDGError(ResponseCode.Common.Failed, e.ErrorMsg);
             }
         }
     }

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

@@ -56,7 +56,7 @@ namespace XD.SDK.Account.Internal.Standalone
             string authRequest = $"{url}?{string.Join("&", queryPairs)}";
 
             // 弹出授权页
-            XDGLogger.Debug($"auth: {authRequest}");
+            XDGLogger.Debug($"auth: {authRequest}", XDGLoggerTag.Account);
             AliyunTrack.LoginAuthorize();
             // 登陆跳转授权 Track
             Application.OpenURL(Uri.EscapeUriString(authRequest));
@@ -79,8 +79,8 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     HttpListenerContext context = await server.GetContextAsync();
 
-                    XDGLogger.Debug($"Request url: {context.Request.RawUrl}");
-                    XDGLogger.Debug($"Request method: {context.Request.HttpMethod}");
+                    XDGLogger.Debug($"Request url: {context.Request.RawUrl}", XDGLoggerTag.Account);
+                    XDGLogger.Debug($"Request method: {context.Request.HttpMethod}", XDGLoggerTag.Account);
 
                     context.Response.StatusCode = 200;
                     context.Response.Close();
@@ -129,7 +129,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
                 catch (Exception e)
                 {
-                    XDGLogger.Debug(e.Message);
+                    XDGLogger.Debug(e.Message, XDGLoggerTag.Account);
                     // 异常结果则一直 pending
                     // 登陆授权失败
                     AliyunTrack.LoginAuthorizeFail(e.Message);

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

@@ -46,7 +46,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 return;
             }
 
-            XDGLogger.Debug("XSupportManager is disabled by config, skipping polling start");
+            XDGLogger.Debug("XSupportManager is disabled by config, skipping polling start", XDGLoggerTag.Support);
         }
 
         private const string XdgSupportUserUnreadCheck = "api/support/v1/user/unread/check";
@@ -85,7 +85,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
         private static async void CheckUnRead()
         {
-            XDGLogger.Debug("Support check unread");
+            XDGLogger.Debug("Support check unread", XDGLoggerTag.Support);
             try
             {
                 string requestUrl;
@@ -112,7 +112,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 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}");
+                XDGLogger.Debug($"Support Check UnRead Success, hasUnread:{response.Data.HasUnread} interval:{response.Data.IntervalSec}", XDGLoggerTag.Support);
                 if (bUnReadStatusChange)
                 {
                     AccountFeaturesImpl.Instance.GetUserStatusCallback()
@@ -142,7 +142,7 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (ObjectDisposedException e)
             {
-                XDGLogger.Warn($"Support Cancel CheckUnRead Action error:{e.Message}");
+                XDGLogger.Warn($"Support Cancel CheckUnRead Action error:{e.Message}", XDGLoggerTag.Support);
             }
 
             Instance.cts = new CancellationTokenSource();
@@ -158,7 +158,7 @@ namespace XD.SDK.Account.Internal.Standalone
                     }
                     catch (TaskCanceledException e)
                     {
-                        XDGLogger.Warn($"Support Start CheckUnRead Action error:{e.Message}");
+                        XDGLogger.Warn($"Support Start CheckUnRead Action error:{e.Message}", XDGLoggerTag.Support);
                     }
                 });
                 return;
@@ -169,7 +169,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
         private static async void RequestSupportUrl(XDGRoleInfo roleInfo, string path, Dictionary<string, object> extra, Action<bool, bool, string> action)
         {
-            XDGLogger.Debug("Support RequestSupportUrl");
+            XDGLogger.Debug("Support RequestSupportUrl", XDGLoggerTag.Support);
             try
             {
                 path = path ?? "";
@@ -216,7 +216,7 @@ namespace XD.SDK.Account.Internal.Standalone
             }
             catch (XDGError e)
             {
-                XDGLogger.Warn($"Support RequestSupportUrl error:{e.ErrorMsg}");
+                XDGLogger.Warn($"Support RequestSupportUrl error:{e.ErrorMsg}", XDGLoggerTag.Support);
                 action.Invoke(false, false, null);
             }
         }

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

@@ -431,7 +431,8 @@ namespace XD.SDK.Account.Internal.Standalone
 
         private static Dictionary<string, string> GetLoginModuleCommonProperties(string eventName, string userLoginTypeString = "")
         {
-            var current = XDGEventBus.Publish<XDGUser>(XDGEvents.AccountGetCurrentUser)?.UserId;
+            var result = XDGEventBus.Publish<XDGUser>(XDGEvents.AccountGetCurrentUser);
+            var current = result.GetValueOrDefault()?.UserId;
             var content = new Dictionary<string, string>();
             content["tag"] = "sdklogin";
             content["event_session_id"] = LoginEventSessionId;

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

@@ -11,8 +11,10 @@ using Vuplex.WebView;
 using XD.SDK.Common;
 using XD.SDK.Common.Internal.Standalone;
 
-namespace XD.SDK.Account.Internal.Standalone {
-    public class RiskControlAlert : UIElement {
+namespace XD.SDK.Account.Internal.Standalone
+{
+    public class RiskControlAlert : UIElement
+    {
         public const int CONTROL_DONE_CODE = 0;
         public const int CLOSE_CODE = -1;
         public const int BACK_CODE = 1;
@@ -22,59 +24,87 @@ namespace XD.SDK.Account.Internal.Standalone {
 
         private CanvasWebViewPrefab canvasWebViewPrefab;
 
-        public static async Task<int> Control(Func<string, Task<RequestVerifyCodeData>> requestVerifyCodeFunc) {
+        public static async Task<int> Control(Func<string, Task<RequestVerifyCodeData>> requestVerifyCodeFunc)
+        {
             RiskControlAlert alert = null;
             string riskControlData = null;
             TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
-            try {
+            try
+            {
                 UIManager.ShowLoading(true);
                 RequestVerifyCodeData verifyCodeData = await requestVerifyCodeFunc(riskControlData);
                 tcs.TrySetResult(verifyCodeData.ReSendInterval);
-            } catch (XDGError e) {
-                if (e.Code == PhoneModule.RISK_CONTROL) {
+            }
+            catch (XDGError e)
+            {
+                if (e.Code == PhoneModule.RISK_CONTROL)
+                {
                     // 触发风控
-                    alert = UIManager.ShowUI<RiskControlAlert>("XDRiskControlAlert", null, async (code, data) => {
-                        if (code == CLOSE_CODE) {
+                    alert = UIManager.ShowUI<RiskControlAlert>("XDRiskControlAlert", null, async (code, data) =>
+                    {
+                        if (code == CLOSE_CODE)
+                        {
                             UIManager.Dismiss();
                             tcs.TrySetException(XDGErrorExtensions.CancelledError());
-                        } else if (code == BACK_CODE) {
+                        }
+                        else if (code == BACK_CODE)
+                        {
                             UIManager.Dismiss();
-                        } else if (code == CONTROL_DONE_CODE) {
+                        }
+                        else if (code == CONTROL_DONE_CODE)
+                        {
                             riskControlData = data as string;
-                            try {
+                            try
+                            {
                                 UIManager.ShowLoading();
                                 RequestVerifyCodeData result = await requestVerifyCodeFunc(riskControlData);
                                 tcs.TrySetResult(result.ReSendInterval);
-                            } catch (XDGError ex) {
+                            }
+                            catch (XDGError ex)
+                            {
                                 UIManager.DismissLoading();
-                                if (ex.Code == PhoneModule.RISK_CONTROL) {
+                                if (ex.Code == PhoneModule.RISK_CONTROL)
+                                {
                                     // 触发风控
                                     await alert.Reload();
-                                } else if (ex.Code == PhoneModule.RISK_CONTROL_FAILED) {
+                                }
+                                else if (ex.Code == PhoneModule.RISK_CONTROL_FAILED)
+                                {
                                     // 滑动验证失败
                                     await alert.Reload();
                                     UIManager.ShowToast(e.Message);
-                                } else {
+                                }
+                                else
+                                {
                                     tcs.TrySetException(ex);
                                 }
-                            } finally {
+                            }
+                            finally
+                            {
                                 UIManager.DismissLoading();
                             }
                         }
                     });
-                } else {
+                }
+                else
+                {
                     tcs.TrySetException(e);
                 }
-            } catch (Exception e) {
+            }
+            catch (Exception e)
+            {
                 tcs.TrySetException(e);
-            } finally {
+            }
+            finally
+            {
                 UIManager.DismissLoading();
             }
 
             return await tcs.Task;
         }
 
-        private void Awake() {
+        private void Awake()
+        {
             Transform webviewContainer = transform.Find("WebViewContainer");
             canvasWebViewPrefab = CanvasWebViewPrefab.Instantiate();
             canvasWebViewPrefab.transform.SetParent(webviewContainer);
@@ -89,19 +119,21 @@ namespace XD.SDK.Account.Internal.Standalone {
             closeButton.onClick.AddListener(OnCloseClicked);
         }
 
-        private async void Start() {
+        private async void Start()
+        {
             UIManager.ShowLoading();
 
             await canvasWebViewPrefab.WaitUntilInitialized();
 
             canvasWebViewPrefab.DragMode = DragMode.DragWithinPage;
 
-            canvasWebViewPrefab.WebView.MessageEmitted += (sender, eventArgs) => {
-                XDGLogger.Debug(eventArgs.Value);
+            canvasWebViewPrefab.WebView.MessageEmitted += (sender, eventArgs) =>
+            {
+                XDGLogger.Debug(eventArgs.Value, XDGLoggerTag.Web);
                 Dictionary<string, string> response = JsonConvert.DeserializeObject<Dictionary<string, string>>(eventArgs.Value);
                 Dictionary<string, object> data = JsonConvert.DeserializeObject<Dictionary<string, object>>(response["message"]);
                 string riskControlData = JsonConvert.SerializeObject(data["data"]);
-                XDGLogger.Debug(riskControlData);
+                XDGLogger.Debug(riskControlData, XDGLoggerTag.Web);
                 UIManager.Dismiss();
 
                 OnCallback(CONTROL_DONE_CODE, riskControlData);
@@ -121,7 +153,7 @@ namespace XD.SDK.Account.Internal.Standalone {
                 NetworkInterfaceType _type2 = NetworkInterfaceType.Ethernet;
 
                 if ((item.NetworkInterfaceType == _type1 || item.NetworkInterfaceType == _type2) && item.OperationalStatus == OperationalStatus.Up)
-#endif 
+#endif
                 {
                     foreach (UnicastIPAddressInformation ip in item.GetIPProperties().UnicastAddresses)
                     {
@@ -129,17 +161,21 @@ namespace XD.SDK.Account.Internal.Standalone {
                         if (ip.Address.AddressFamily == AddressFamily.InterNetwork)
                         {
                             output = ip.Address.ToString();
-                            XDGLogger.Debug($"ip local: {output}");
+                            XDGLogger.Debug($"ip local: {output}", XDGLoggerTag.Web);
                         }
                     }
                 }
             }
+
             return output;
         }
-        private async Task Reload() {
+
+        private async Task Reload()
+        {
             UIManager.ShowLoading();
             var ip = GetIP();
-            canvasWebViewPrefab.WebView.LoadUrl($"https://login-xdsdk.xd.cn/awsc?platform={Platform}&eventSessionId={AliyunTrack.LoginEventSessionId}&login_type=Phone&sub_login_type=2&xd_client_id={ConfigModule.ClientId}&device_id={SystemInfo.deviceUniqueIdentifier}&os={SystemInfo.operatingSystem}&ip={ip}&app_version={Application.version}&language={XDLocalization.CurrentLang.ToString()}");
+            canvasWebViewPrefab.WebView.LoadUrl(
+                $"https://login-xdsdk.xd.cn/awsc?platform={Platform}&eventSessionId={AliyunTrack.LoginEventSessionId}&login_type=Phone&sub_login_type=2&xd_client_id={ConfigModule.ClientId}&device_id={SystemInfo.deviceUniqueIdentifier}&os={SystemInfo.operatingSystem}&ip={ip}&app_version={Application.version}&language={XDLocalization.CurrentLang.ToString()}");
             await canvasWebViewPrefab.WebView.WaitForNextPageLoadToFinish();
             // 注入 js
             _ = canvasWebViewPrefab.WebView.ExecuteJavaScript(@";(function (window) {
@@ -157,8 +193,10 @@ namespace XD.SDK.Account.Internal.Standalone {
             UIManager.DismissLoading();
         }
 
-        private string Platform {
-            get {
+        private string Platform
+        {
+            get
+            {
                 if (Application.platform == RuntimePlatform.Android)
                 {
                     return "Android";
@@ -176,11 +214,13 @@ namespace XD.SDK.Account.Internal.Standalone {
 
         #region UI Events
 
-        private void OnBackClicked() {
+        private void OnBackClicked()
+        {
             OnCallback(BACK_CODE, null);
         }
 
-        private void OnCloseClicked() {
+        private void OnCloseClicked()
+        {
             OnCallback(CLOSE_CODE, null);
         }
 

package/Runtime/Internal/Standalone/UserCenterAlert.cs

@@ -227,7 +227,7 @@ namespace XD.SDK.Account.Standalone
             }
             catch (Exception e)
             {
-                XDGLogger.Warn($"列表请求失败: {e}");
+                XDGLogger.Warn($"列表请求失败: {e}", XDGLoggerTag.Account);
                 errorView.SetActive(true);
             }
             finally
@@ -238,7 +238,7 @@ namespace XD.SDK.Account.Standalone
 
         private async void Bind(LoginType loginType, int cellIndex)
         {
-            XDGLogger.Debug("绑定： " + loginType);
+            XDGLogger.Debug("绑定:" + loginType, XDGLoggerTag.Account);
             try
             {
                 await UserModule.Bind(loginType);
@@ -254,11 +254,11 @@ namespace XD.SDK.Account.Standalone
             }
             catch (TaskCanceledException)
             {
-                XDGLogger.Debug("关闭绑定");
+                XDGLogger.Debug("关闭绑定", XDGLoggerTag.Account);
             }
             catch (Exception e)
             {
-                XDGLogger.Warn($"绑定失败: {e}");
+                XDGLogger.Warn($"绑定失败: {e}", XDGLoggerTag.Account);
                 UIManager.ShowToast(localizableString.BindError);
             }
         }
@@ -289,7 +289,7 @@ namespace XD.SDK.Account.Standalone
 
         private async void Unbind(LoginType loginType, int cellIndex)
         {
-            XDGLogger.Debug("解绑： " + loginType);
+            XDGLogger.Debug("解绑： " + loginType, XDGLoggerTag.Account);
             UIManager.ShowLoading();
             try
             {
@@ -313,7 +313,7 @@ namespace XD.SDK.Account.Standalone
             }
             catch (XDGError e)
             {
-                XDGLogger.Warn(e.ToString());
+                XDGLogger.Warn(e.ToString(), XDGLoggerTag.Account);
                 if (string.IsNullOrEmpty(e.Message))
                 {
                     UIManager.ShowToast(localizableString.UnbindError);
@@ -325,11 +325,11 @@ namespace XD.SDK.Account.Standalone
             }
             catch (TaskCanceledException)
             {
-                XDGLogger.Debug("关闭解绑");
+                XDGLogger.Debug("关闭解绑", XDGLoggerTag.Account);
             }
             catch (Exception e)
             {
-                XDGLogger.Warn($"解绑失败: {e}");
+                XDGLogger.Warn($"解绑失败: {e}", XDGLoggerTag.Account);
                 UIManager.ShowToast(localizableString.UnbindError);
             }
             finally
@@ -370,7 +370,7 @@ namespace XD.SDK.Account.Standalone
 
         public void ErrorViewTap()
         {
-            XDGLogger.Debug("点击了 errorViewTap");
+            XDGLogger.Debug("点击了 errorViewTap", XDGLoggerTag.Account);
             errorView.SetActive(false);
             _ = RequestBinds();
         }

package/Runtime/Internal/Standalone/UserModule.cs

@@ -71,7 +71,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
                 catch (Exception e)
                 {
-                    XDGLogger.Warn(e.Message);
+                    XDGLogger.Error(e, XDGLoggerTag.Account);
                 }
             }
         }
@@ -123,7 +123,7 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 if (XDGCommonInternal.IsCn())
                 {
-                    XDGLogger.Warn("暂不支持的登录方式");
+                    XDGLogger.Warn("暂不支持的登录方式", XDGLoggerTag.Account);
                     throw new XDGError(ResponseCode.Common.UnavailableService, "暂不支持的登录方式");
                 }
                 else
@@ -157,7 +157,7 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 if (XDGCommonInternal.IsCn())
                 {
-                    XDGLogger.Warn("暂不支持的登录方式");
+                    XDGLogger.Warn($"暂不支持的登录方式:{LoginType.Email}", XDGLoggerTag.Account);
                     throw new XDGError(ResponseCode.Common.UnavailableService, "暂不支持的登录方式");
                 }
                 else
@@ -177,7 +177,7 @@ namespace XD.SDK.Account.Internal.Standalone
         {
             if (XDGCommonInternal.IsCn() && loginType == LoginType.Email)
             {
-                XDGLogger.Warn("暂不支持的登录方式");
+                XDGLogger.Warn($"暂不支持的登录方式:{LoginType.Email}", XDGLoggerTag.Account);
                 throw new XDGError(ResponseCode.Common.UnavailableService, "暂不支持的登录方式");
             }
 
@@ -192,7 +192,7 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 if (localUser == null)
                 {
-                    XDGLogger.Warn("缺少本地登录信息");
+                    XDGLogger.Warn("自动登录缺少本地登录信息", XDGLoggerTag.Account);
                     if (ConfigModule.UsingTapPC && !ConfigModule.DisableAutoLogin2Tap)
                     {
                         return await Login(LoginType.TapTap);
@@ -205,18 +205,18 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     try
                     {
-                        var token = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKGetAccessToken);
-
+                        var tokenResult = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKGetAccessToken);
+                        var token = tokenResult.GetValueOrThrow();
                         if (token == null || !token.ContainsKey("token"))
                         {
-                            XDGLogger.Warn("Third token expired.");
+                            XDGLogger.Warn("Third token expired.", XDGLoggerTag.Account);
                             throw new XDGError(ResponseCode.Account.TokenExpired, "Third token expired.");
                         }
                     }
-                    catch (Exception e)
+                    catch (XDGError e)
                     {
-                        XDGLogger.Warn(e.Message);
-                        throw new XDGError(ResponseCode.Common.Failed, e.Message);
+                        XDGLogger.Warn(e.ErrorMsg, XDGLoggerTag.Account);
+                        throw new XDGError(ResponseCode.Common.Failed, e.ErrorMsg);
                     }
                 }
 
@@ -233,7 +233,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
                 catch (Exception e)
                 {
-                    XDGLogger.Warn(e.Message);
+                    XDGLogger.Warn(e.Message, XDGLoggerTag.Account);
                 }
 
                 _ = AccessTokenModule.Refresh();
@@ -283,10 +283,10 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
                 catch (Exception e)
                 {
-                    XDGLogger.Warn(e.ToString());
+                    XDGLogger.Warn(e.ToString(), XDGLoggerTag.Account);
                 }
 
-                XDGLogger.Debug(string.Format($"xd userID: {user.UserId}"));
+                XDGLogger.Debug(string.Format($"xd userID: {user.UserId}"), XDGLoggerTag.Account);
                 return user;
             }
             catch (XDGError e)
@@ -366,7 +366,7 @@ namespace XD.SDK.Account.Internal.Standalone
                     XDGAccessToken localToken = await AccessTokenModule.GetLocalAccessToken();
                     string steamId = SteamAuth.GetSteamIdFromSDK();
                     XDGUser user;
-                    XDGLogger.Debug($"LoginByConsole steamId: {steamId} localToken: {localToken} steamId: {steamId}");
+                    XDGLogger.Debug($"LoginByConsole steamId: {steamId} localToken: {localToken} steamId: {steamId}", XDGLoggerTag.Account);
                     if (!string.IsNullOrEmpty(localToken?.SteamId) && !string.IsNullOrEmpty(steamId) && localToken?.SteamId == steamId)
                     {
                         try
@@ -401,10 +401,10 @@ namespace XD.SDK.Account.Internal.Standalone
                     }
                     catch (Exception e)
                     {
-                        XDGLogger.Warn(e.ToString());
+                        XDGLogger.Warn(e.ToString(), XDGLoggerTag.Account);
                     }
 
-                    XDGLogger.Debug(string.Format($"xd userID: {user.UserId}"));
+                    XDGLogger.Debug(string.Format($"xd userID: {user.UserId}"), XDGLoggerTag.Account);
                     return user;
                 }
                 finally

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

@@ -17,7 +17,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
         public async void Handler(IBridgeWebView webView, string data, Action<object> callbackFunction)
         {
-            XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}");
+            XDGLogger.Debug($"message from javascript by:{GetName()} with data:{data}", XDGLoggerTag.Web);
             var token = await AccessTokenModule.GetLocalAccessToken();
             if (token == null)
             {

package/Runtime/Internal/XDGAccountInternal.cs

@@ -22,7 +22,7 @@ namespace XD.SDK.Account
 #endif
             if (_platformWrapper == null)
             {
-                XDGLogger.Error("unsupported platform: " + Application.platform);
+                XDGLogger.Error("unsupported platform: " + Application.platform, XDGLoggerTag.Account);
             }
         }
 

package/package.json

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