com.xd.sdk.account 0.0.15-alpha → 0.0.16-alpha

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

@@ -6,4 +6,4 @@
 //
 #define XDGAccount_VERSION @"7.0.0"
 #define XDSAccount_VERSION_CODE @"7000000"
-// HASH 8bd7e79
+// HASH 5925d9e

package/Runtime/Internal/Mobile/AccountFeaturesImpl.cs

@@ -77,7 +77,7 @@ namespace XD.SDK.Account.Internal.Mobile
                 .Callback(true)
                 .OnceTime(false)
                 .CommandBuilder();
-            EngineBridge.GetInstance().CallHandler(command, async (result) =>
+            EngineBridge.GetInstance().CallHandler(command, (result) =>
             {
                 if (!XDGTool.CheckResultSuccess(result))
                 {
@@ -290,6 +290,12 @@ namespace XD.SDK.Account.Internal.Mobile
 
         private async Task SyncTdsUser(XDGUser user)
         {
+            var bHasTdsUser = ReflectionUtils.FindType("TapTap.Bootstrap.TDSUser", "XD.SDK.TDSWrapper") != null;
+            if (!bHasTdsUser)
+            {
+                return;
+            }
+
             try
             {
                 var result = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TdsSDKGetUser);
@@ -308,6 +314,7 @@ namespace XD.SDK.Account.Internal.Mobile
                     XDGLogger.Warn("[SyncTDSUser] sessionToken is Null!");
                     return;
                 }
+
                 XDGEventBus.Publish(XDGEvents.TdsSDKSyncUser, sessionToken, user.UserId);
             }
             catch (Exception e)

package/Runtime/Internal/Standalone/AccountFeaturesImpl.cs

@@ -148,6 +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>
                     {
                         {
@@ -170,6 +171,7 @@ namespace XD.SDK.Account.Internal.Standalone
                         if (code == XDWebViewAlert.CLOSE_CODE)
                         {
                             UIManager.Dismiss();
+                            UIManager.DismissLoading();
                         }
                     });
                 }

package/Runtime/Internal/Standalone/UserCenterAlert.cs

@@ -385,7 +385,7 @@ namespace XD.SDK.Account.Standalone
                 { Dialog.SECONDARY_TEXT_KEY, localizable.Confirm2 },
                 { Dialog.PRIMARY_TEXT_KEY, localizable.Cancel2 }
             };
-            UIManager.ShowUI<Dialog>("Dialog", config, async (code, data) =>
+            UIManager.ShowUI<Dialog>("Dialog", config, (code, data) =>
             {
                 UIManager.ShowLoading(true);
                 _currentTime = TIMEOUT;

package/Runtime/Internal/Standalone/UserModule.cs

@@ -185,7 +185,7 @@ namespace XD.SDK.Account.Internal.Standalone
             {
                 return await LoginByConsole();
             }
-            
+
             var localUser = await GetLocalUser();
 
             if (loginType == LoginType.Default)
@@ -197,6 +197,7 @@ namespace XD.SDK.Account.Internal.Standalone
                     {
                         return await Login(LoginType.TapTap);
                     }
+
                     throw new XDGError(ResponseCode.Common.Failed, XDLocalization.GetCurrentLocalizableString().LoginFailed);
                 }
 
@@ -205,7 +206,7 @@ namespace XD.SDK.Account.Internal.Standalone
                     try
                     {
                         var token = await XDGEventBus.PublishAsync<Dictionary<string, object>>(XDGEvents.TapSDKGetAccessToken);
-                        
+
                         if (token == null || !token.ContainsKey("token"))
                         {
                             XDGLogger.Warn("Third token expired.");
@@ -218,7 +219,7 @@ namespace XD.SDK.Account.Internal.Standalone
                         throw new XDGError(ResponseCode.Common.Failed, e.Message);
                     }
                 }
-                
+
                 try
                 {
                     localUser = await FetchUserInfo();
@@ -236,7 +237,7 @@ namespace XD.SDK.Account.Internal.Standalone
                 }
 
                 _ = AccessTokenModule.Refresh();
-                
+
                 return localUser;
             }
 
@@ -278,12 +279,13 @@ namespace XD.SDK.Account.Internal.Standalone
                 var user = await FetchUserInfo();
                 try
                 {
-                    await SyncTDSUser(user.UserId);
+                    await SyncTdsUser(user.UserId);
                 }
                 catch (Exception e)
                 {
                     XDGLogger.Warn(e.ToString());
                 }
+
                 XDGLogger.Debug(string.Format($"xd userID: {user.UserId}"));
                 return user;
             }
@@ -360,11 +362,11 @@ namespace XD.SDK.Account.Internal.Standalone
                 {
                     AliyunTrack.LoginStart("Default_Steam", "Steam");
                     UIManager.ShowLoading();
-                    
+
                     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}");
                     if (!string.IsNullOrEmpty(localToken?.SteamId) && !string.IsNullOrEmpty(steamId) && localToken?.SteamId == steamId)
                     {
                         try
@@ -395,7 +397,7 @@ namespace XD.SDK.Account.Internal.Standalone
 
                     try
                     {
-                        await SyncTDSUser(user.UserId);
+                        await SyncTdsUser(user.UserId);
                     }
                     catch (Exception e)
                     {
@@ -410,6 +412,7 @@ namespace XD.SDK.Account.Internal.Standalone
                     UIManager.DismissLoading();
                 }
             }
+
             // 尝试其他主机 SDK
             throw new NotImplementedException("NO supported console sdk.");
         }
@@ -456,16 +459,19 @@ namespace XD.SDK.Account.Internal.Standalone
             }
         }
 
-        private static async Task SyncTDSUser(string userId)
+        private static async Task SyncTdsUser(string userId)
         {
             // 效果等于 BecomeWithSessionToken,为了少一次网络请求
             // SyncTokenResponse tokenResponse = await XDHttpClient.Client.PostAsync<SyncTokenResponse>(XDG_LOGIN_SYN);
             // TDSUser user = TDSUser.CreateWithoutData(TDSUser.CLASS_NAME, userId) as TDSUser;
             // user.SessionToken = tokenResponse.SyncToken.SessionToken;
-            // await user.SaveToLocal();
-            var token = await XDHttpClient.Client.PostAsync<SyncTokenResponse>(XDG_LOGIN_SYN);
-            
-            XDGEventBus.Publish(XDGEvents.TdsSDKSyncUser, token.SyncToken.SessionToken, userId);
+            // await user.SaveToLocal();    
+            var bHasTdsUser = ReflectionUtils.FindType("TapTap.Bootstrap.TDSUser", "XD.SDK.TDSWrapper") != null;
+            if (bHasTdsUser)
+            {
+                var token = await XDHttpClient.Client.PostAsync<SyncTokenResponse>(XDG_LOGIN_SYN);
+                XDGEventBus.Publish(XDGEvents.TdsSDKSyncUser, token.SyncToken.SessionToken, userId);
+            }
         }
 
         public static async Task<XDGUser> FetchUserInfo()
@@ -509,6 +515,7 @@ namespace XD.SDK.Account.Internal.Standalone
                                         {
                                             tcs.SetResult(await FetchUserInfo());
                                         }
+
                                         return;
                                     }
                                 }

package/Runtime/Internal/XDGAccountInternal.cs

@@ -19,7 +19,6 @@ namespace XD.SDK.Account
             _platformWrapper = XD.SDK.Account.Internal.Mobile.AccountFeaturesImpl.Instance;
 #elif UNITY_STANDALONE
             _platformWrapper = XD.SDK.Account.Internal.Standalone.AccountFeaturesImpl.Instance;
-            // XDHttpClientFactory.RegisterHeadersTaskFunc(GetRequestAuthorizationHeader);
 #endif
             if (_platformWrapper == null)
             {

package/package.json

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