com.taptap.sdk.login 4.8.0-beta.1 → 4.8.1

package/Mobile/Editor/NativeDependencies.xml

@@ -1,16 +1,16 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <dependencies>
   <androidPackages>
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.8.0-beta.1"/>
+    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.8.1-beta.7"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod name="TapTapLoginSDK" version="~> 4.6.3" bitcodeEnabled="false" addToAllTargets="false"/>
-    <iosPod name="TapTapGidSDK" version="~> 4.6.3" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapLoginSDK" version="4.8.1-beta.7"/>
+    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapGidSDK" version="4.8.1-beta.7"/>
   </iosPods>
 </dependencies>

package/Mobile/Runtime/TapTapLoginImpl.cs

@@ -5,6 +5,7 @@ using TapSDK.Login.Mobile.Runtime;
 using TapSDK.Login.Internal;
 using UnityEngine;
 using System.Runtime.InteropServices;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Login.Mobile
 {
@@ -43,7 +44,7 @@ namespace TapSDK.Login.Mobile
                 .CommandBuilder(),
                 result =>
                 {
-                    Debug.Log("Login result: " + result.content);
+                    TapLog.Log("Login result: " + result.content);
                     var wrapper = new AccountWrapper(result.content);
                     if (wrapper.code == 1)
                     {
@@ -76,7 +77,7 @@ namespace TapSDK.Login.Mobile
                 .Callback(true)
                 .OnceTime(true)
                 .CommandBuilder());
-            Debug.Log("Current account: " + result.content);
+            TapLog.Log("Current account: " + result.content);
             return new AccountWrapper(result.content).account;
         }
     }

package/Runtime/Public/TapTapLogin.cs

@@ -7,7 +7,7 @@ namespace TapSDK.Login
     public class TapTapLogin
     {
 
-        public static readonly string Version = "4.8.0-beta.1";
+        public static readonly string Version = "4.8.1";
 
         public const string TAP_LOGIN_SCOPE_BASIC_INFO = "basic_info";
         public const string TAP_LOGIN_SCOPE_PUBLIC_PROFILE = "public_profile";

package/Standalone/Runtime/Internal/UIManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using TapSDK.Core.Internal.Log;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
@@ -27,7 +28,7 @@ namespace TapSDK.Login.Internal
         {
             if (containerObj == null || uiElements.Count == 0)
             {
-                Debug.LogError("No UIElement can be popped.");
+                TapLog.Error("No UIElement can be popped.");
             }
             else
             {
@@ -35,7 +36,7 @@ namespace TapSDK.Login.Internal
 
                 if (targetName != null && !targetName.Equals(element.name))
                 {
-                    Debug.LogError("Could not find specify UIElement : " + targetName);
+                    TapLog.Error("Could not find specify UIElement : " + targetName);
                     return;
                 }
 

package/Standalone/Runtime/Internal/WebLoginRequestManager.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using TapSDK.Core;
 using UnityEngine;
 using Random = System.Random;
+using TapSDK.Core.Internal.Log;
 
 namespace TapSDK.Login.Internal
 {
@@ -119,7 +120,7 @@ namespace TapSDK.Login.Internal
         public static string GetRedirectUri()
         {
             var redirectUri = $"http://{IPAddress.Loopback}:{GetRandomUnusedPort()}/";
-            TapLogger.Debug($"redirect uri:{redirectUri}");
+            TapLog.Log($"redirect uri:{redirectUri}");
             return redirectUri;
         }
 

package/Standalone/Runtime/Internal2/AccountManager.cs

@@ -1,7 +1,10 @@
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using TapSDK.Core;
+using TapSDK.Core.Internal.Utils;
 using TapSDK.Core.Standalone.Internal.Openlog;
 
 namespace TapSDK.Login.Internal
@@ -48,11 +51,13 @@ namespace TapSDK.Login.Internal
                 {
                     DataStorage.SaveString(_account, null);
                     TapAppDurationStandalone.OnLogout();
+                    EventManager.TriggerEvent(EventManager.OnTapUserChanged, "");
                 }
                 else
                 {
                     DataStorage.SaveString(_account, value.ToJson());
                     TapAppDurationStandalone.OnLogin(value?.openId);
+                    EventManager.TriggerEvent(EventManager.OnTapUserChanged, "");
                 }
             }
         }
@@ -62,24 +67,41 @@ namespace TapSDK.Login.Internal
             var accountStr = DataStorage.LoadString(_account);
             if (!string.IsNullOrEmpty(accountStr))
             {
-                Account = new TapTapAccount(Json.Deserialize(accountStr) as Dictionary<string, object>);
+                try
+                {
+                    Account = new TapTapAccount(Json.Deserialize(accountStr) as Dictionary<string, object>);
+                }
+                catch (Exception e)
+                {
+                    UnityEngine.Debug.Log("TapSDK Login find account cache but parse failed" + e.Message);
+                    DataStorage.RemoveCacheKey(_account);
+                }
             }
             else
             {
-                var accessTokenStr = DataStorage.LoadString(_accessToken);
-                if (string.IsNullOrEmpty(accessTokenStr))
+                try
                 {
-                    return;
-                }
+                    var accessTokenStr = DataStorage.LoadString(_accessToken);
+                    if (string.IsNullOrEmpty(accessTokenStr))
+                    {
+                        return;
+                    }
 
-                var profileStr = DataStorage.LoadString(_profile);
-                if (string.IsNullOrEmpty(profileStr))
+                    var profileStr = DataStorage.LoadString(_profile);
+                    if (string.IsNullOrEmpty(profileStr))
+                    {
+                        return;
+                    }
+                    var accessToken = JsonConvert.DeserializeObject<AccessToken>(accessTokenStr);
+                    var profile = JsonConvert.DeserializeObject<Profile>(profileStr);
+                    Account = new TapTapAccount(accessToken, profile.openid, profile.unionid, profile.name, profile.avatar, profile.email);
+                }
+                catch (Exception e)
                 {
-                    return;
+                    UnityEngine.Debug.Log("TapSDK Login find old account cache but parse failed" + e.Message);
+                    DataStorage.RemoveCacheKey(_accessToken);
+                    DataStorage.RemoveCacheKey(_profile);
                 }
-                var accessToken = JsonConvert.DeserializeObject<AccessToken>(accessTokenStr);
-                var profile = JsonConvert.DeserializeObject<Profile>(profileStr);
-                Account = new TapTapAccount(accessToken, profile.openid, profile.unionid, profile.name, profile.avatar, profile.email);
             }
         }
 

package/Standalone/Runtime/Internal2/TapLoginStandaloneImpl.cs

@@ -6,6 +6,7 @@ using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
 using TapSDK.Core;
+using TapSDK.Core.Internal.Log;
 using TapSDK.Core.Internal.Utils;
 using TapSDK.Core.Standalone;
 using TapSDK.Core.Standalone.Internal.Http;
@@ -48,7 +49,7 @@ namespace TapSDK.Login.Internal
             TapTapSdk.SDKInitialize(clientId, regionType == TapTapRegionType.CN);
             AccountManager.Instance.Init();
 
-            TapLogger.Debug("RegisterListenerForTapClientCheck ");
+            TapLog.Log("RegisterListenerForTapClientCheck ");
             RegisterListenerForTapClientCheck();
 
             _ = CheckAndRefreshToken();
@@ -187,7 +188,7 @@ namespace TapSDK.Login.Internal
         {
             string info = "{\"device_id\":\"" + SystemInfo.deviceModel + "\"}";
             string sdkUA = "client_id=" + TapTapSdk.ClientId + "&uuid=" + SystemInfo.deviceUniqueIdentifier;
-            TapLogger.Debug("LoginWithScopes start in thread = " + Thread.CurrentThread.ManagedThreadId);
+            TapLog.Log("LoginWithScopes start in thread = " + Thread.CurrentThread.ManagedThreadId);
             TaskCompletionSource<T> taskCompletionSource = new TaskCompletionSource<T>();
 
             string responseType = "code";
@@ -199,8 +200,8 @@ namespace TapSDK.Login.Internal
             string codeChallengeMethod = "S256";
             TapLoginClientBridge.TapLoginResponseByTapClient response = await TapLoginClientBridge.LoginWithScopesAsync(scopes,
             responseType, redirectUri, codeChallenge, state, codeChallengeMethod, versionCode, sdkUA, info);
-            TapLogger.Debug("start handle login result");
-            TapLogger.Debug("LoginWithScopes handle in thread = " + Thread.CurrentThread.ManagedThreadId);
+            TapLog.Log("start handle login result");
+            TapLog.Log("LoginWithScopes handle in thread = " + Thread.CurrentThread.ManagedThreadId);
 
             if (response.isCancel)
             {
@@ -212,7 +213,7 @@ namespace TapSDK.Login.Internal
             }
             else
             {
-                TapLogger.Debug("login success prepare get token");
+                TapLog.Log("login success prepare get token");
                 try
                 {
                     Uri uri = new Uri(response.redirectUri);
@@ -261,13 +262,13 @@ namespace TapSDK.Login.Internal
                     }
                     else
                     {
-                        TapLogger.Debug("login success prepare get token but get  error " + error);
+                        TapLog.Log("login success prepare get token but get  error " + error);
                         throw new TapException((int)TapErrorCode.ERROR_CODE_UNDEFINED, error ?? "数据解析异常");
                     }
                 }
                 catch (Exception ex)
                 {
-                    TapLogger.Debug("login success prepare get token  fail " + ex.Message);
+                    TapLog.Log("login success prepare get token  fail " + ex.Message);
                     taskCompletionSource.TrySetException(ex);
                 }
             }
@@ -352,7 +353,7 @@ namespace TapSDK.Login.Internal
         {
             EventManager.AddListener(EventManager.IsLaunchedFromTapTapPCFinished, (openId) =>
             {
-                TapLogger.Debug("receive IsLaunchedFromTapTapPCFinished event");
+                TapLog.Log("receive IsLaunchedFromTapTapPCFinished event");
                 if (openId is string userId && !string.IsNullOrEmpty(userId))
                 {
                     CheckLoginStateWithTapClient(userId);
@@ -373,7 +374,7 @@ namespace TapSDK.Login.Internal
                 if (account.openId != openId)
                 {
                     isCacheUserSameWithTapClient = false;
-                    TapLogger.Debug("receive IsLaunchedFromTapTapPCFinished event and not same");
+                    TapLog.Log("receive IsLaunchedFromTapTapPCFinished event and not same");
                     Logout();
                 }
                 else
@@ -431,7 +432,7 @@ namespace TapSDK.Login.Internal
             }
             catch (Exception e)
             {
-                Debug.Log("refresh TapToken fail reason : " + e.Message + "\n stack = " + e.StackTrace);
+                TapLog.Log("refresh TapToken fail reason : " + e.Message + "\n stack = " + e.StackTrace);
             }
         }
     }

package/Standalone/Runtime/Internal2/UI/WebController.cs

@@ -75,7 +75,7 @@ namespace TapSDK.Login.Internal {
             while (isRunning) {
                 try {
                     HttpListenerContext context = await server.GetContextAsync();
-                    Debug.Log($"{context.Request.HttpMethod} {context.Request.Url}");
+                    TapLog.Log($"{context.Request.HttpMethod} {context.Request.Url}");
                     context.Response.StatusCode = 200;
                     context.Response.Close();
 

package/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f0c8495254e0e400e8b1f01be6dfd882
+guid: 3ef73b7c3a65b498db2a9b989fe5cdbd
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/package.json

@@ -1,11 +1,11 @@
 {
-  "name": "com.taptap.sdk.login",
-  "displayName": "TapTapSDK Login",
-  "description": "TapTapSDK Login",
-  "version": "4.8.0-beta.1",
-  "unity": "2019.4",
-  "license": "MIT",
-  "dependencies": {
-    "com.taptap.sdk.core": "4.8.0-beta.1"
-  }
+    "name": "com.taptap.sdk.login",
+    "displayName": "TapTapSDK Login",
+    "description": "TapTapSDK Login",
+    "version": "4.8.1",
+    "unity": "2019.4",
+    "license": "MIT",
+    "dependencies": {
+        "com.taptap.sdk.core": "4.8.1"
+    }
 }