com.taptap.sdk.login 4.4.2 → 4.5.0

package/Mobile/Editor/NativeDependencies.xml

@@ -4,13 +4,13 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.4.2"/>
+    <androidPackage spec="com.taptap.sdk:tap-login-unity:4.5.0"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
     <iosPod name="Kingfisher" version="~> 6.0" bitcodeEnabled="false" addToAllTargets="false"/>
-    <iosPod name="TapTapLoginSDK" version="~> 4.4.0" bitcodeEnabled="false" addToAllTargets="false"/>
+    <iosPod name="TapTapLoginSDK" version="~> 4.5.0" bitcodeEnabled="false" addToAllTargets="false"/>
   </iosPods>
 </dependencies>

package/Runtime/Internal/Region.cs

@@ -2,8 +2,6 @@ namespace TapSDK.Login.Internal
 {
     public abstract class Region
     {
-        protected static bool isRND = false;
-        
         public abstract string WebHost();
 
         public abstract string ApiHost();
@@ -46,25 +44,19 @@ namespace TapSDK.Login.Internal
         
         private static string accountHost = "https://accounts.taptap.cn";
 
-        private static string webHostRND = "https://oauth.api.xdrnd.cn";
-
-        private static string apiHostRND = "https://open.api.xdrnd.cn";
-        
-        private static string accountHostRND = "https://accounts-beta.xdrnd.cn";
-        
         public override string WebHost()
         {
-            return isRND ? webHostRND : webHost;
+            return webHost;
         }
 
         public override string ApiHost()
         {
-            return isRND ? apiHostRND : apiHost;
+            return apiHost;
         }
 
         public override string AccountHost()
         {
-            return isRND ? accountHostRND : accountHost;
+            return accountHost;
         }
         
     }
@@ -75,23 +67,19 @@ namespace TapSDK.Login.Internal
         private static string apiHost = "https://open.tapapis.com";
         private static string accountHost = "https://accounts.taptap.io";
         
-        private static string webHostRND = "https://oauth.api.xdrnd.com";
-        private static string apiHostRND = "https://open.api.xdrnd.com";
-        private static string accountHostRND = "https://accounts-io-beta.xdrnd.com";
-        
         public override string WebHost()
         {
-            return isRND ? webHostRND : webHost;
+            return webHost;
         }
 
         public override string ApiHost()
         {
-            return isRND ? apiHostRND : apiHost;
+            return apiHost;
         }
 
         public override string AccountHost()
         {
-            return isRND ? accountHostRND : accountHost;
+            return accountHost;
         }
         
     }

package/Runtime/Public/TapTapLogin.cs

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

package/Runtime/Public/TapTapSdk.cs

@@ -8,9 +8,6 @@ namespace TapSDK.Login.Internal
 {
     public static class TapTapSdk
     {
-        // todo 
-        public const string Version = "4.3.10";
-
         public static string ClientId { get; private set; }
 
         public static Region CurrentRegion { get; private set; }

package/Standalone/Resources/Sprites/{taptap-login-android-client.png.meta → tapsdk-login-client-cn-android.png.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4b5153c44d44441ab840b57d857ccb66
+guid: e38788d43832b4897aa451bc9f3cb2b4
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -36,7 +36,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

package/Standalone/Resources/Sprites/{taptap-login-ios-client.png.meta → tapsdk-login-client-cn-ios.png.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d0d91238b4da84ff39e0ba9920b1a022
+guid: 788e0772bd246491aab010b1272ec919
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -36,7 +36,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -71,42 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

package/Standalone/Resources/Sprites/tapsdk-login-client-global-android.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 3fbe7ff9924f040c8858c551bdd67c5c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Resources/Sprites/tapsdk-login-client-global-ios.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 63974b91ba2c14a8b937b229d4e686bc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Standalone/Runtime/Internal2/AccountManager.cs

@@ -47,10 +47,12 @@ namespace TapSDK.Login.Internal
                 if (value == null)
                 {
                     DataStorage.SaveString(_account, null);
+                    TapAppDurationStandalone.OnLogout();
                 }
                 else
                 {
                     DataStorage.SaveString(_account, value.ToJson());
+                    TapAppDurationStandalone.OnLogin(value?.openId);
                 }
             }
         }

package/Standalone/Runtime/Internal2/Http/Response/ProfileResponse.cs

@@ -20,9 +20,4 @@ namespace TapSDK.Login.Internal.Http {
         [JsonProperty("email")]
         public string Email { get; set; }
     }
-
-    public class ProfileResponse {
-        [JsonProperty("data")]
-        public ProfileData Data { get; set; }
-    }
 }

package/Standalone/Runtime/Internal2/Http/Response/QRCodeResponse.cs

@@ -14,9 +14,4 @@ namespace TapSDK.Login.Internal.Http {
         [JsonProperty("interval")]
         public int Interval { get; set; }
     }
-
-    public class QRCodeResponse {
-        [JsonProperty("data")]
-        public QRCodeData Data { get; set; }
-    }
 }

package/Standalone/Runtime/Internal2/Http/Response/TokenResponse.cs

@@ -25,9 +25,4 @@ namespace TapSDK.Login.Internal.Http {
         public HashSet<string> Scopes => !string.IsNullOrEmpty(Scope) ? 
             new HashSet<string>(Scope.Split(' ')) : new HashSet<string>();
     }
-
-    public class TokenResponse {
-        [JsonProperty("data")]
-        public TokenData Data { get; set; }
-    }
 }

package/Standalone/Runtime/Internal2/Http/TapLoginSign.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using TapSDK.Core.Standalone.Internal.Http;
+
+namespace TapSDK.Login.Standalone.Internal.Http
+{
+    internal class TapLoginSign : ITapHttpSign
+    {
+        public Dictionary<string, string> GetFixedHeaders(string url, HttpMethod method, string moduleName, string moduleVersion, bool enableAuthorization)
+        {
+            return new Dictionary<string, string>
+            {
+                { "User-Agent", TapHttpUtils.GenerateUserAgent()},
+            };
+        }
+
+        public Dictionary<string, string> GetFixedQueryParams()
+        {
+            return new Dictionary<string, string>();
+        }
+
+        public void Sign(HttpRequestMessage signData)
+        {
+            // Do nothing
+        }
+    }
+}

package/Standalone/Runtime/Internal2/Http/{LoginHttpClient.cs.meta → TapLoginSign.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e3ed262175bd04db487ef5c3f3b5953d
+guid: 3c6306bc968684651bbdec346cc621ca
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Standalone/Runtime/Internal2/LoginService.cs

@@ -5,29 +5,37 @@ using System.Security.Cryptography;
 using System.Text;
 using UnityEngine;
 using TapSDK.Login.Internal.Http;
-using TapSDK.Core.Standalone.Internal.Service;
+using TapSDK.Core.Standalone.Internal.Http;
+using TapSDK.Login.Standalone.Internal.Http;
 
 namespace TapSDK.Login.Internal
 {
     public static class LoginService
     {
-        private static readonly LoginHttpClient httpClient = new LoginHttpClient();
-
-        public static LoginHttpClient HttpClient => httpClient;
+        private static readonly TapHttp tapHttp = TapHttp
+            .NewBuilder("TapLogin", TapTapLogin.Version)
+            .Sign(new TapLoginSign())
+            .Build();
 
         public static async Task<QRCodeData> GetQRCodeUrl(string clientId, string[] scopes)
         {
-            Dictionary<string, object> data = new Dictionary<string, object> {
+            Dictionary<string, string> data = new Dictionary<string, string> {
                 { "client_id", clientId },
                 { "response_type", "device_code" },
                 { "scope", string.Join(",", scopes) },
-                { "version", TapTapSdk.Version },
+                { "version", TapTapLogin.Version },
                 { "platform", "unity" },
                 { "info", "{\"device_id\":\"" + SystemInfo.deviceModel + "\"}" }
             };
-            QRCodeResponse response = await httpClient.Post<QRCodeResponse>(TapTapSdk.CurrentRegion.CodeUrl(),
-                data: data);
-            return response.Data;
+            TapHttpResult<QRCodeData> result = await tapHttp.PostFormAsync<QRCodeData>(TapTapSdk.CurrentRegion.CodeUrl(), form: data);
+            if (result.IsSuccess)
+            {
+                return result.Data;
+            }
+            else
+            {
+                throw result.HttpException;
+            }
         }
 
         public static async Task<TokenData> Authorize(string clientId, string code)
@@ -40,9 +48,15 @@ namespace TapSDK.Login.Internal
                 { "redirect_uri", WebLoginRequestManager.Instance.GetCurrentRequest().GetRedirectUri() },
                 { "code_verifier", WebLoginRequestManager.Instance.GetCodeVerifier() }
             };
-            TokenResponse response = await httpClient.Post<TokenResponse>(TapTapSdk.CurrentRegion.TokenUrl(),
-                data: data);
-            return response.Data;
+            TapHttpResult<TokenData> result = await tapHttp.PostFormAsync<TokenData>(TapTapSdk.CurrentRegion.TokenUrl(), form: data);
+            if (result.IsSuccess)
+            {
+                return result.Data;
+            }
+            else
+            {
+                throw result.HttpException;
+            }
         }
 
         public static async Task<TokenData> RequestScanQRCodeResult(string clientId, string deviceCode)
@@ -56,9 +70,15 @@ namespace TapSDK.Login.Internal
                 { "platform", "unity" },
                 { "info", "{\"device_id\":\"" + SystemInfo.deviceModel + "\"}" }
             };
-            TokenResponse response = await httpClient.Post<TokenResponse>(TapTapSdk.CurrentRegion.TokenUrl(),
-                data: data);
-            return response.Data;
+            TapHttpResult<TokenData> result = await tapHttp.PostFormAsync<TokenData>(TapTapSdk.CurrentRegion.TokenUrl(), form: data);
+            if (result.IsSuccess)
+            {
+                return result.Data;
+            }
+            else
+            {
+                throw result.HttpException;
+            }
         }
 
         public static async Task<ProfileData> GetProfile(string clientId, AccessToken token, int timestamp = 0)
@@ -78,11 +98,19 @@ namespace TapSDK.Login.Internal
                 uri.PathAndQuery,
                 uri.Host,
                 "443", ts);
-            Dictionary<string, object> headers = new Dictionary<string, object> {
+            Dictionary<string, string> headers = new Dictionary<string, string> {
                 { "Authorization", sign }
             };
-            ProfileResponse response = await httpClient.Get<ProfileResponse>(url, headers: headers);
-            return response.Data;
+
+            TapHttpResult<ProfileData> result = await tapHttp.GetAsync<ProfileData>(url, headers: headers);
+            if(result.IsSuccess)
+            {
+                return result.Data;
+            }
+            else
+            {
+                throw result.HttpException;
+            }   
         }
 
         public static string GetAuthorizationHeader(string kid,
@@ -122,7 +150,7 @@ namespace TapSDK.Login.Internal
 
         public static async Task<TokenData> RefreshToken(string clientId, string accessToken)
         {
-            Dictionary<string, object> data = new Dictionary<string, object> {
+            Dictionary<string, string> data = new Dictionary<string, string> {
                 { "client_id", clientId },
                 { "grant_type", "refresh_token" },
                 { "token", accessToken },
@@ -130,9 +158,15 @@ namespace TapSDK.Login.Internal
                 { "platform", "unity" },
                 { "info", "{\"device_id\":\"" + SystemInfo.deviceModel + "\"}" }
             };
-            TokenResponse response = await httpClient.Post<TokenResponse>(TapTapSdk.CurrentRegion.TokenUrl(),
-                data: data);
-            return response.Data;
+            TapHttpResult<TokenData> result = await tapHttp.PostFormAsync<TokenData>(TapTapSdk.CurrentRegion.TokenUrl(), form: data);
+            if(result.IsSuccess)
+            {
+                return result.Data;
+            }
+            else
+            {
+                throw result.HttpException;
+            }       
         }
     }
 }

package/Standalone/Runtime/Internal2/TapLoginStandaloneImpl.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using TapSDK.Core;
 using TapSDK.Core.Internal.Utils;
+using TapSDK.Core.Standalone.Internal.Http;
 using TapSDK.Login.Internal.Http;
 using TapSDK.Login.Standalone;
 using TapSDK.Login.Standalone.Internal;
@@ -155,9 +156,9 @@ namespace TapSDK.Login.Internal
                     TokenData tokenData = null;
                     try{
                         tokenData =  await LoginService.RefreshToken(TapTapSdk.ClientId, accessToken.kid);
-                    }catch(TapException e){
+                    }catch(TapHttpServerException e){
                         //清除本地缓存
-                        if(e.code < 0 ){
+                        if(e.ErrorData.Code < 0 ){
                             Logout();
                         }
                         return;

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

@@ -7,19 +7,15 @@ using TapSDK.Core;
 using TapSDK.Core.Internal.Utils;
 using UnityEngine.EventSystems;
 using TapSDK.Core.Internal.Log;
+using TapSDK.Core.Standalone.Internal.Http;
 
 namespace TapSDK.Login.Internal {
     public class QRCodeController {
-        private readonly static string DEMO_IMAGE_CN_HOST = "https://sdk-assets.tds1.tapfiles.cn";
-        private readonly static string DEMO_IMAGE_URL_IOS_ZH = $"{DEMO_IMAGE_CN_HOST}/scan-guide/ios.png";
-        private readonly static string DEMO_IMAGE_URL_ANDROID_ZH = $"{DEMO_IMAGE_CN_HOST}/scan-guide/android.png";
+        private readonly static string DEFAULT_CLIENT_CN_IOS = "Sprites/tapsdk-login-client-cn-ios";
+        private readonly static string DEFAULT_CLIENT_CN_ANDROID = "Sprites/tapsdk-login-client-cn-android";
 
-        private readonly static string DEMO_IMAGE_IO_HOST = "https://sdk-assets.ap-sg.tdsfiles.com";
-        private readonly static string DEMO_IMAGE_URL_IOS_EN = $"{DEMO_IMAGE_IO_HOST}/scan-guide/ios.png";
-        private readonly static string DEMO_IMAGE_URL_ANDROID_EN = $"{DEMO_IMAGE_IO_HOST}/scan-guide/android.png";
-
-        // private readonly static string DEFAULT_IOS_CLIENT = "Sprites/taptap-login-ios-client";
-        // private readonly static string DEFAULT_ANDROID_CLIENT = "Sprites/taptap-login-android-client";
+        private readonly static string DEFAULT_CLIENT_GLOBAL_IOS = "Sprites/tapsdk-login-client-global-ios";
+        private readonly static string DEFAULT_CLIENT_GLOBAL_ANDROID = "Sprites/tapsdk-login-client-global-android";
 
         private readonly static string AUTH_PENDING = "authorization_pending";
         private readonly static string AUTH_WAITING = "authorization_waiting";
@@ -116,17 +112,17 @@ namespace TapSDK.Login.Internal {
                         TokenData tokenData = await LoginService.RequestScanQRCodeResult(clientId, qrcodeData.DeviceCode);
                         TapLog.Log("Login , QRCodeController Success");
                         onAuth.Invoke(tokenData, "pc_code");
-                        
                         return ;
-                    } catch (TapException e) {
+                    } catch (TapHttpServerException e) {
+                        string errorMsg = e.ErrorData?.Error ?? "";
                         ILoginLang lang = LoginLanguage.GetCurrentLang();
-                        if (e.Message == AUTH_PENDING) {
+                        if (errorMsg == AUTH_PENDING) {
 
-                        } else if (e.Message == AUTH_WAITING) {
+                        } else if (errorMsg == AUTH_WAITING) {
                             UI.UIManager.Instance.OpenToast(true, 
                                 $"{lang.QrnNoticeSuccess()}，{lang.QrnNoticeSuccess2()}",
                                 icon: UI.UIManager.WhiteToastSuccessIcon);
-                        } else if (e.Message == AUTH_DENIED) {
+                        } else if (errorMsg == AUTH_DENIED) {
                             UI.UIManager.Instance.OpenToast(true, 
                                 $"{lang.QrNoticeCancel()}，{lang.QrNoticeCancel2()}",
                                 icon: UI.UIManager.WhiteToastErrorIcon);
@@ -141,17 +137,17 @@ namespace TapSDK.Login.Internal {
         }
 
         private void OnShowIOSDemoImage() {
-            string url = DEMO_IMAGE_URL_IOS_ZH;
+            string url = DEFAULT_CLIENT_CN_IOS;
             if (TapTapSDK.taptapSdkOptions != null && TapTapSDK.taptapSdkOptions.region == TapTapRegionType.Overseas) {
-                url = DEMO_IMAGE_URL_IOS_EN;
+                url = DEFAULT_CLIENT_GLOBAL_IOS;
             }
             ShowDemoImage(url);
         }
 
         private void OnShowAndroidDemoImage() {
-            string url = DEMO_IMAGE_URL_ANDROID_ZH;
+            string url = DEFAULT_CLIENT_CN_ANDROID;
             if (TapTapSDK.taptapSdkOptions != null && TapTapSDK.taptapSdkOptions.region == TapTapRegionType.Overseas) {
-                url = DEMO_IMAGE_URL_ANDROID_EN;
+                url = DEFAULT_CLIENT_GLOBAL_ANDROID;
             }
             ShowDemoImage(url);
         }
@@ -160,8 +156,9 @@ namespace TapSDK.Login.Internal {
             demoImage.texture = null;
             scanTips.SetActive(true);
             try {
-                demoImage.texture = await ImageUtils.LoadImage(url);
+                demoImage.texture = Resources.Load<Texture2D>(url);
             } catch (Exception) {
+                TapLog.Log("Load demo image failed : " + url);
                 demoImage.texture = null;
             }
         }

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

@@ -62,6 +62,7 @@ namespace TapSDK.Login.Internal {
             WebLoginRequestManager.Instance.CreateNewLoginRequest(scopes);
 
             string url = WebLoginRequestManager.Instance.GetCurrentRequest().GetWebLoginUrl();
+            TapLog.Log("WebController , OpenURL : " + url);
             Application.OpenURL(url);
 
             // 启动监听

package/package.json

@@ -2,10 +2,10 @@
   "name": "com.taptap.sdk.login",
   "displayName": "TapTapSDK Login",
   "description": "TapTapSDK Login",
-  "version": "4.4.2",
+  "version": "4.5.0",
   "unity": "2019.4",
   "license": "MIT",
   "dependencies": {
-    "com.taptap.sdk.core": "4.4.2"
+    "com.taptap.sdk.core": "4.5.0"
   }
 }

package/Standalone/Runtime/Internal2/Http/LoginHttpClient.cs

@@ -1,139 +0,0 @@
-using System;
-using System.Net;
-using System.Text;
-using System.Linq;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using System.Security.Cryptography;
-using Newtonsoft.Json;
-using TapSDK.Core;
-using TapSDK.Core.Internal.Json;
-using TapSDK.Core.Internal.Http;
-
-namespace TapSDK.Login.Internal.Http {
-    public class LoginHttpClient {
-        private readonly HttpClient client;
-
-        public LoginHttpClient() {
-            client = new HttpClient();
-            client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/x-www-form-urlencoded"));
-        }
-
-        public Task<T> Get<T>(string url,
-            Dictionary<string, object> headers = null,
-            Dictionary<string, object> queryParams = null) {
-            return Request<T>(url, HttpMethod.Get, headers, null, queryParams);
-        }
-
-        public Task<T> Post<T>(string url,
-            Dictionary<string, object> headers = null,
-            object data = null,
-            Dictionary<string, object> queryParams = null) {
-            return Request<T>(url, HttpMethod.Post, headers, data, queryParams);
-        }
-
-        public Task<T> Put<T>(string url,
-            Dictionary<string, object> headers = null,
-            object data = null,
-            Dictionary<string, object> queryParams = null) {
-            return Request<T>(url, HttpMethod.Put, headers, data, queryParams);
-        }
-
-        public Task Delete(string url,
-            Dictionary<string, object> headers = null,
-            object data = null,
-            Dictionary<string, object> queryParams = null) {
-            return Request<Dictionary<string, object>>(url, HttpMethod.Delete, headers, data, queryParams);
-        }
-
-        async Task<T> Request<T>(string url,
-            HttpMethod method,
-            Dictionary<string, object> headers = null,
-            object data = null,
-            Dictionary<string, object> queryParams = null) {
-            url = BuildUrl(url, queryParams);
-            HttpRequestMessage request = new HttpRequestMessage {
-                RequestUri = new Uri(url),
-                Method = method,
-            };
-            FillHeaders(request.Headers, headers);
-
-            string content = null;
-            if (data != null) {
-                content = JsonConvert.SerializeObject(data);
-                Dictionary<string, string> formData = JsonConvert.DeserializeObject<Dictionary<string, object>>(content)
-                    .ToDictionary(item => item.Key, item => item.Value.ToString());
-                FormUrlEncodedContent requestContent = new FormUrlEncodedContent(formData);
-                request.Content = requestContent;
-            }
-            TapHttpUtils.PrintRequest(client, request, content);
-            HttpResponseMessage response = await client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
-            request.Dispose();
-
-            string resultString = await response.Content.ReadAsStringAsync();
-            response.Dispose();
-            TapHttpUtils.PrintResponse(response, resultString);
-
-            if (response.IsSuccessStatusCode) {
-                T ret = JsonConvert.DeserializeObject<T>(resultString,
-                    TapJsonConverter.Default);
-                return ret;
-            }
-            throw HandleErrorResponse(response.StatusCode, resultString);
-        }
-
-        TapException HandleErrorResponse(HttpStatusCode statusCode, string responseContent) {
-            int code = (int)statusCode;
-            string message = responseContent;
-            try {
-                ErrorResponse response = JsonConvert.DeserializeObject<ErrorResponse>(responseContent,
-                    TapJsonConverter.Default);
-                code = response.Data.Code;
-                message = response.Data.Error;
-            } catch (Exception e) {
-                TapLogger.Error(e);
-            }
-            return new TapException(code, message);
-        }
-
-        string BuildUrl(string url, Dictionary<string, object> queryParams) {
-            if (queryParams != null) {
-                IEnumerable<string> queryPairs = queryParams.Select(kv => $"{kv.Key}={kv.Value}");
-                string queries = string.Join("&", queryPairs);
-                url = $"{url}?{queries}";
-            }
-            return url;
-        }
-
-        void FillHeaders(HttpRequestHeaders headers, Dictionary<string, object> reqHeaders = null) {
-            // 额外 headers
-            if (reqHeaders != null) {
-                foreach (KeyValuePair<string, object> kv in reqHeaders) {
-                    headers.Add(kv.Key, kv.Value.ToString());
-                }
-            }
-
-            // 签名
-            long timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-            string hash = GetMd5Hash($"{timestamp}");
-            string sign = $"{hash},{timestamp}";
-            headers.Add("X-LC-Sign", sign);
-        }
-
-        static string GetMd5Hash(string input) {
-            MD5 md5 = MD5.Create();
-            byte[] data = md5.ComputeHash(Encoding.UTF8.GetBytes(input));
-            return ToHex(data);
-        }
-
-        static string ToHex(byte[] bytes) {
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < bytes.Length; i++) {
-                sb.Append(bytes[i].ToString("x2"));
-            }
-            return sb.ToString();
-        }
-    }
-}

package/Standalone/Runtime/Internal2/Http/Response/ErrorResponse.cs

@@ -1,16 +0,0 @@
-using Newtonsoft.Json;
-
-namespace TapSDK.Login.Internal.Http {
-    public class ErrorData {
-        [JsonProperty("code")]
-        public int Code { get; set; }
-
-        [JsonProperty("error")]
-        public string Error { get; set; }
-    }
-
-    public class ErrorResponse {
-        [JsonProperty("data")]
-        public ErrorData Data { get; set; }
-    }
-}

package/Standalone/Runtime/Internal2/Http/Response/ErrorResponse.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: bf3ced9270c8442a4a7c2158841ccad8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/link.xml

@@ -1,4 +0,0 @@
-<linker>
-  <assembly fullname="TapSDK.Login.Runtime" preserve="all" />
-  <assembly fullname="TapSDK.Login.Mobile.Runtime" preserve="all" />
-</linker>

package/link.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: be71b67c0945c40c0817e128f2bff96a
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: