com.taptap.sdk.core 4.7.1 → 4.8.1-beta.1

package/Standalone/Runtime/Public/TapClientStandalone.cs

@@ -7,6 +7,7 @@ using System;
 using System.Runtime.InteropServices;
 using TapSDK.Core.Standalone.Internal.Openlog;
 using System.Threading;
+using TapSDK.Core.Internal.Log;
 
 
 
@@ -36,13 +37,13 @@ namespace TapSDK.Core.Standalone
             if (isRuningIsLaunchedFromTapTapPC)
             {
                 UIManager.Instance.OpenToast("IsLaunchedFromTapTapPC 正在执行，请勿重复调用", UIManager.GeneralToastLevel.Error);
-                Log( true,"IsLaunchedFromTapTapPC 正在执行，请勿重复调用");
+                TapLog.Error("IsLaunchedFromTapTapPC 正在执行，请勿重复调用");
                 return false;
             }
             // 多次执行时返回上一次结果
             if (lastIsLaunchedFromTapTapPCResult != -1)
             {
-                Log( false,"IsLaunchedFromTapTapPC duplicate invoke return " + lastIsLaunchedFromTapTapPCResult);
+                TapLog.Log("IsLaunchedFromTapTapPC duplicate invoke return " + lastIsLaunchedFromTapTapPCResult);
                 return lastIsLaunchedFromTapTapPCResult > 0;
             }
 
@@ -51,7 +52,7 @@ namespace TapSDK.Core.Standalone
             if (coreOptions == null)
             {
                 UIManager.Instance.OpenToast("IsLaunchedFromTapTapPC 调用必须在初始化之后", UIManager.GeneralToastLevel.Error);
-                Log( true,"IsLaunchedFromTapTapPC 调用必须在初始化之后");
+                TapLog.Error("IsLaunchedFromTapTapPC 调用必须在初始化之后");
                 return false;
             }
             string clientId = coreOptions.clientId;
@@ -59,7 +60,7 @@ namespace TapSDK.Core.Standalone
             if (string.IsNullOrEmpty(clientId) || string.IsNullOrEmpty(pubKey))
             {
                 UIManager.Instance.OpenToast("clientId 及 TapPubKey 参数都不能为空, clientId =" + clientId + ", TapPubKey = " + pubKey, UIManager.GeneralToastLevel.Error);
-                Log( true,"clientId 或 TapPubKey 无效, clientId = " + clientId + ", TapPubKey = " + pubKey);
+                TapLog.Error("clientId 或 TapPubKey 无效, clientId = " + clientId + ", TapPubKey = " + pubKey);
                 return false;
             }
             isRuningIsLaunchedFromTapTapPC = true;
@@ -69,13 +70,13 @@ namespace TapSDK.Core.Standalone
             try
             {
                 TapInitResult result = await RunClientBridgeMethod(clientId, pubKey);
-                Log(false, "check startupWithClientBridge finished thread = " + Thread.CurrentThread.ManagedThreadId);
+                TapLog.Log("check startupWithClientBridge finished thread = " + Thread.CurrentThread.ManagedThreadId);
                 isRuningIsLaunchedFromTapTapPC = false;
                 if (result.needQuitGame)
                 {
                     lastIsLaunchedFromTapTapPCResult = 0;
                     TapCoreTracker.Instance.TrackSuccess(TapCoreTracker.METHOD_LAUNCHER, sessionId, TapCoreTracker.SUCCESS_TYPE_RESTART);
-                    Log( false,"IsLaunchedFromTapTapPC Quit game");
+                    TapLog.Log("IsLaunchedFromTapTapPC Quit game");
                     Application.Quit();
                     return false;
                 }
@@ -85,11 +86,11 @@ namespace TapSDK.Core.Standalone
                     {
                         string currentClientId;
                         bool isFetchClientIdSuccess = TapClientBridge.GetClientId(out currentClientId);
-                        Log( false,"IsLaunchedFromTapTapPC get  clientId = " + currentClientId, false);
+                        TapLog.Log("IsLaunchedFromTapTapPC get  clientId = " + currentClientId);
                         if (isFetchClientIdSuccess && !string.IsNullOrEmpty(currentClientId) && currentClientId != clientId)
                         {
                             UIManager.Instance.OpenToast("SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致", UIManager.GeneralToastLevel.Error);
-                            Log( true,"SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致");
+                            TapLog.Error("SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致");
                             TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, -1, "SDK 中配置的 clientId = " + clientId + "与 Tap 启动器中" + currentClientId + "不一致");
                             lastIsLaunchedFromTapTapPCResult = 0;
                             return false;
@@ -98,17 +99,17 @@ namespace TapSDK.Core.Standalone
                         bool fetchOpenIdSuccess = TapClientBridge.GetTapUserOpenId(out openId);
                         if (fetchOpenIdSuccess)
                         {
-                            Log( false,"IsLaunchedFromTapTapPC get  openId = " + openId, false);
+                            TapLog.Log("IsLaunchedFromTapTapPC get  openId = " + openId);
                             EventManager.TriggerEvent(EventManager.IsLaunchedFromTapTapPCFinished, openId);
                         }
                         else
                         {
-                            Log( false,"IsLaunchedFromTapTapPC get  openId failed");
+                            TapLog.Log("IsLaunchedFromTapTapPC get  openId failed");
                         }
                         lastIsLaunchedFromTapTapPCResult = 1;
                         TapClientBridgePoll.StartUp();
                         TapCoreTracker.Instance.TrackSuccess(TapCoreTracker.METHOD_LAUNCHER, sessionId, TapCoreTracker.SUCCESS_TYPE_INIT);
-                        Log( false,"IsLaunchedFromTapTapPC check success");
+                        TapLog.Log("IsLaunchedFromTapTapPC check success");
                         return true;
                     }
                     else
@@ -116,7 +117,7 @@ namespace TapSDK.Core.Standalone
 
                         TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, (int)result.result, result.errorMsg ?? "");
                         lastIsLaunchedFromTapTapPCResult = 0;
-                        Log( false,"IsLaunchedFromTapTapPC show TapClient tip Pannel " + result.result + " , error = " + result.errorMsg);
+                        TapLog.Log("IsLaunchedFromTapTapPC show TapClient tip Pannel " + result.result + " , error = " + result.errorMsg);
                         string tipPannelPath = "Prefabs/TapClient/TapClientConnectTipPanel";
                         if (Resources.Load<GameObject>(tipPannelPath) != null)
                         {
@@ -132,7 +133,7 @@ namespace TapSDK.Core.Standalone
                 lastIsLaunchedFromTapTapPCResult = 0;
                 TapCoreTracker.Instance.TrackFailure(TapCoreTracker.METHOD_LAUNCHER, sessionId, (int)TapSDKInitResult.Unknown, e.Message ?? "");
 
-                Log( false,"IsLaunchedFromTapTapPC check exception = " + e.Message + " \n" + e.StackTrace);
+                TapLog.Log("IsLaunchedFromTapTapPC check exception = " + e.Message + " \n" + e.StackTrace);
                 string tipPannelPath = "Prefabs/TapClient/TapClientConnectTipPanel";
                 if (Resources.Load<GameObject>(tipPannelPath) != null)
                 {
@@ -150,9 +151,10 @@ namespace TapSDK.Core.Standalone
             {
                 await Task.Run(() =>
                 {
-                    Log(false, "check startupWithClientBridge start thread = " + Thread.CurrentThread.ManagedThreadId);
+                    TapLog.Log( "check startupWithClientBridge start thread = " + Thread.CurrentThread.ManagedThreadId);
                     bool needQuitGame = TapClientBridge.TapSDK_RestartAppIfNecessary(clientId);
-                    Log( false,"RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary result = " + needQuitGame);
+                    TapLog.Log("RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary result = " + needQuitGame);
+                    TapLog.Log("RunClientBridgeMethodWithTimeout invoke  TapSDK_RestartAppIfNecessary finished " );
                     if (needQuitGame)
                     {
                         tapInitResult = new TapInitResult(needQuitGame);
@@ -161,7 +163,7 @@ namespace TapSDK.Core.Standalone
                     {
                         string outputError;
                         int tapSDKInitResult = TapClientBridge.CheckInitState(out outputError, pubKey);
-                        Log( false,"RunClientBridgeMethodWithTimeout invoke  CheckInitState result = " + tapSDKInitResult + ", error = " + outputError);
+                        TapLog.Log("RunClientBridgeMethodWithTimeout invoke  CheckInitState result = " + tapSDKInitResult + ", error = " + outputError);
                         tapInitResult = new TapInitResult(tapSDKInitResult, outputError);
                     }
                     task.TrySetResult(tapInitResult);
@@ -170,7 +172,7 @@ namespace TapSDK.Core.Standalone
             }
             catch (Exception ex)
             {
-                Log( false,"RunClientBridgeMethodWithTimeout invoke C 方法出错！" + ex.Message);
+                TapLog.Log("RunClientBridgeMethodWithTimeout invoke C 方法出错！" + ex.Message);
                 task.TrySetException(ex);
             }
             return await task.Task;
@@ -184,6 +186,10 @@ namespace TapSDK.Core.Standalone
             return isChannelPackage;
         }
 
+        public static bool isPassedInLaunchedFromTapTapPCCheck(){
+            return lastIsLaunchedFromTapTapPCResult > 0;
+        }
+
 
         private static Action<bool, string> currentLoginCallback;
 
@@ -196,16 +202,16 @@ namespace TapSDK.Core.Standalone
             if (lastIsLaunchedFromTapTapPCResult == -1)
             {
                 // UIManager.Instance.OpenToast("IsLaunchedFromTapTapPC 正在执行，请在完成后调用授权接口", UIManager.GeneralToastLevel.Error);
-                Log( true," login must be invoked after IsLaunchedFromTapTapPC success");
+                TapLog.Error(" login must be invoked after IsLaunchedFromTapTapPC success");
                 throw new Exception("login must be invoked after IsLaunchedFromTapTapPC success");
             }
-            Log( false,"LoginWithScopes start login by tapclient thread = " + Thread.CurrentThread.ManagedThreadId);
+            TapLog.Log("LoginWithScopes start login by tapclient thread = " + Thread.CurrentThread.ManagedThreadId);
             try
             {
                 TapClientBridge.RegisterCallback(TapEventID.AuthorizeFinished_internal, loginCallbackDelegate);
                 AuthorizeResult authorizeResult = TapClientBridge.LoginWithScopesInternal(scopes, responseType, redirectUri,
      codeChallenge, state, codeChallengeMethod, versonCode, sdkUa, info);
-                Log( false,"LoginWithScopes start result = " + authorizeResult);
+                TapLog.Log("LoginWithScopes start result = " + authorizeResult);
                 if (authorizeResult != AuthorizeResult.OK)
                 {
                     TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished_internal,loginCallbackDelegate);
@@ -220,7 +226,7 @@ namespace TapSDK.Core.Standalone
             }
             catch (Exception ex)
             {
-                Log( false,"LoginWithScopes start login by tapclient error = " + ex.Message);
+                TapLog.Log("LoginWithScopes start login by tapclient error = " + ex.Message);
                 TapClientBridge.UnRegisterCallback(TapEventID.AuthorizeFinished_internal,loginCallbackDelegate);
                 return false;
             }
@@ -231,12 +237,12 @@ namespace TapSDK.Core.Standalone
         [AOT.MonoPInvokeCallback(typeof(TapClientBridge.CallbackDelegate))]
         static void loginCallbackDelegate(int id, IntPtr userData)
         {
-            Log( false,"LoginWithScopes recevie callback " + id);
+            TapLog.Log("LoginWithScopes recevie callback " + id);
             if (id == (int)TapEventID.AuthorizeFinished_internal)
             {
-                Log( false,"LoginWithScopes callback thread = " + Thread.CurrentThread.ManagedThreadId);
+                TapLog.Log("LoginWithScopes callback thread = " + Thread.CurrentThread.ManagedThreadId);
                 TapClientBridge.AuthorizeFinishedResponse response = Marshal.PtrToStructure<TapClientBridge.AuthorizeFinishedResponse>(userData);
-                Log( false,"LoginWithScopes callback = " + response.is_cancel + " uri = " + response.callback_uri);
+                TapLog.Log("LoginWithScopes callback = " + response.is_cancel + " uri = " + response.callback_uri);
                 if (currentLoginCallback != null)
                 {
                     currentLoginCallback(response.is_cancel != 0, response.callback_uri);
@@ -268,7 +274,7 @@ namespace TapSDK.Core.Standalone
             {
                 throw new Exception("purchaseDLC must be invoked after IsLaunchedFromTapTapPC success");
             }
-            Log(false, "purchaseDLC start = " + skuId);
+            TapLog.Log("purchaseDLC start = " + skuId);
             return TapClientBridge.TapDLC_ShowStore(skuId);
         }
 
@@ -283,11 +289,11 @@ namespace TapSDK.Core.Standalone
         [AOT.MonoPInvokeCallback(typeof(TapClientBridge.CallbackDelegate))]
         static void DLCCallbackDelegate(int id, IntPtr userData)
         {
-            Log(false, "queryDlC recevie callback " + id);
+            TapLog.Log("queryDlC recevie callback " + id);
             if (currentDlcDelegate != null)
             {
                 TapClientBridge.DLCPlayableStatusChangedResponse response = Marshal.PtrToStructure<TapClientBridge.DLCPlayableStatusChangedResponse>(userData);
-                Log(false, "queryDlC callback =  " + response.dlc_id + " isOwn = " + response.is_playable);
+                TapLog.Log("queryDlC callback =  " + response.dlc_id + " isOwn = " + response.is_playable);
                 currentDlcDelegate(response.dlc_id, response.is_playable != 0);
             }
         }
@@ -303,11 +309,11 @@ namespace TapSDK.Core.Standalone
         [AOT.MonoPInvokeCallback(typeof(TapClientBridge.CallbackDelegate))]
         static void LicenseCallbackDelegate(int id, IntPtr userData)
         {
-            Log(false, "License recevie callback " + id);
+            TapLog.Log("License recevie callback " + id);
             if (currentLicenseDelegate != null)
             {
                 TapClientBridge.GamePlayableStatusChangedResponse response = Marshal.PtrToStructure<TapClientBridge.GamePlayableStatusChangedResponse>(userData);
-                Log(false, "License callback  isOwn changed " + response.is_playable );
+                TapLog.Log("License callback  isOwn changed " + response.is_playable );
                 currentLicenseDelegate(response.is_playable != 0);
             }
         }
@@ -322,39 +328,6 @@ namespace TapSDK.Core.Standalone
         }
 
 
-        private static void Log(bool isError, string data, bool alwaysShow = true)
-        {
-            if (!string.IsNullOrEmpty(data))
-            {
-                if (TapLogger.LogDelegate != null)
-                {
-                    if (isError)
-                    {
-                        TapLogger.Error(data);
-                    }
-                    else
-                    {
-                        TapLogger.Debug(data);
-                    }
-
-                }
-                else
-                {
-                    if (alwaysShow || TapTapSDK.taptapSdkOptions.enableLog)
-                    {
-                        if (isError)
-                        {
-                            UnityEngine.Debug.LogErrorFormat($"[TapSDK] ERROR: {data}");
-                        }
-                        else
-                        {
-                            UnityEngine.Debug.LogFormat($"[TapSDK] INFO: {data}");
-                        }
-                    }
-                }
-            }
-        }
-
         // 初始化校验结果
         private class TapInitResult
         {

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -120,7 +120,7 @@ namespace TapSDK.Core.Standalone
         {
             if (coreOptions == null)
             {
-                Debug.Log("coreOptions is null");
+                TapLog.Log("coreOptions is null");
                 return;
             }
             TapLog.Log("UpdateLanguage called with language: " + language);

package/Standalone/Runtime/Public/TapEventStandalone.cs

@@ -56,7 +56,7 @@ namespace TapSDK.Core.Standalone
             }
             if (!IsValidUserID(userID))
             {
-                TapLogger.Error("Invalid user ID, length should be 1-160 and only contains a-zA-Z0-9_+/=.,:");
+                TapLog.Error("Invalid user ID, length should be 1-160 and only contains a-zA-Z0-9_+/=.,:");
                 return;
             }
 
@@ -103,7 +103,7 @@ namespace TapSDK.Core.Standalone
             // name 长度256非空，不符合的丢事件，打log
             if (!checkLength(name))
             {
-                Debug.LogError(name + " Event name length should be less than or equal to 256 characters.");
+                TapLog.Error(name + " Event name length should be less than or equal to 256 characters.");
                 return;
             }
             Dictionary<string, object> prop = Json.Deserialize(properties) as Dictionary<string, object>;
@@ -207,12 +207,12 @@ namespace TapSDK.Core.Standalone
             }
             if (!checkLength(key))
             {
-                Debug.LogError(key + " Property key length should be less than or equal to 256 characters.");
+                TapLog.Error(key + " Property key length should be less than or equal to 256 characters.");
                 return;
             }
             if (!checkLength(value))
             {
-                Debug.LogError(value + " Property value length should be less than or equal to 256 characters.");
+                TapLog.Error(value + " Property value length should be less than or equal to 256 characters.");
                 return;
             }
             Tracker.AddCommonProperty(key, value);
@@ -287,7 +287,7 @@ namespace TapSDK.Core.Standalone
             }
             if (amount <= 0 || amount > 100000000000)
             {
-                UnityEngine.Debug.LogError(amount + " is invalid, amount should be in range (0, 100000000000]");
+                TapLog.Error(amount + " is invalid, amount should be in range (0, 100000000000]");
                 return;
             }
             Tracker.LogPurchasedEvent(orderID, productName, amount, currencyType, paymentMethod, properties);
@@ -313,7 +313,7 @@ namespace TapSDK.Core.Standalone
         /// <param name="value">oaid</param>
         public void SetOAID(string value)
         {
-            Debug.Log("SetOAID called in PC platform (empty implementation)");
+            TapLog.Log("SetOAID called in PC platform (empty implementation)");
         }
 
         /// <summary>
@@ -321,7 +321,7 @@ namespace TapSDK.Core.Standalone
         /// </summary>
         public void LogDeviceLoginEvent()
         {
-            Debug.Log("LogDeviceLoginEvent called in PC platform (empty implementation)");
+            TapLog.Log("LogDeviceLoginEvent called in PC platform (empty implementation)");
         }
 
         /// <summary>
@@ -402,12 +402,12 @@ namespace TapSDK.Core.Standalone
                 {
                     if (property.Key.Length <= 0 || property.Key.Length > 256)
                     {
-                        Debug.Log(property.Key + " Property key length should be more then 0 and less than or equal to 256 characters.");
+                        TapLog.Log(property.Key + " Property key length should be more then 0 and less than or equal to 256 characters.");
                         continue;
                     }
                     if (property.Value.ToString().Length > 256)
                     {
-                        Debug.Log(property.Value + " Property value length should be less than or equal to 256 characters.");
+                        TapLog.Log(property.Value + " Property value length should be less than or equal to 256 characters.");
                         continue;
                     }
                     filteredProperties.Add(property.Key, property.Value);

package/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7dbdaf3a91ea44d24a51131f915db17b
+guid: cd547e3b8c029465aa1602c53876f69e
 TextScriptImporter:
   externalObjects: {}
   userData: 

package/package.json

@@ -1,11 +1,11 @@
 {
-  "name": "com.taptap.sdk.core",
-  "displayName": "TapTapSDK Core",
-  "description": "TapTapSDK Core",
-  "version": "4.7.1",
-  "unity": "2019.4",
-  "license": "MIT",
-  "dependencies": {
-    "com.google.external-dependency-manager": "1.2.179"
-  }
+    "name": "com.taptap.sdk.core",
+    "displayName": "TapTapSDK Core",
+    "description": "TapTapSDK Core",
+    "version": "4.8.1-beta.1",
+    "unity": "2019.4",
+    "license": "MIT",
+    "dependencies": {
+        "com.google.external-dependency-manager": "1.2.179"
+    }
 }