com.taptap.sdk.core 4.9.0 → 4.9.2

package/Mobile/Editor/NativeDependencies.xml

@@ -4,12 +4,12 @@
     <repositories>
       <repository>https://repo.maven.apache.org/maven2</repository>
     </repositories>
-    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.9.0"/>
+    <androidPackage spec="com.taptap.sdk:tap-core-unity:4.9.2"/>
   </androidPackages>
   <iosPods>
     <sources>
       <source>https://github.com/CocoaPods/Specs.git</source>
     </sources>
-    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Core" version="4.9.0"/>
+    <iosPod addToAllTargets="false" bitcodeEnabled="false" name="TapTapSDK/Core" version="4.9.2"/>
   </iosPods>
 </dependencies>

package/Mobile/Runtime/TapCoreMobile.cs

@@ -20,6 +20,23 @@ namespace TapSDK.Core.Mobile
             TapLog.Log("TapCoreMobile constructor");
             TapLoom.Initialize();
             EngineBridgeInitializer.Initialize();
+            // 由于当通过 Application.Quit 退出时，iOS 端不会收到 applicationWillTerminate 的通知，
+            // 所以不会调用 C++ 的 OnAppStop 方法，导致小概率会因 C++ 资源未正确释放触发崩溃，所以添加监听
+#if UNITY_IOS
+            EventManager.AddListener(
+                EventManager.OnApplicationQuit,
+                (quit) =>
+                {
+                    TapLog.Log("TapSDK Unity OnApplicationQuit");
+                    Bridge.CallHandler(
+                        EngineBridgeInitializer
+                            .GetBridgeServer()
+                            .Method("handleEngineQuitEvent")
+                            .CommandBuilder()
+                    );
+                }
+            );
+#endif
         }
 
         public void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)

package/Runtime/Internal/Utils/TapLoom.cs

@@ -15,7 +15,11 @@ namespace TapSDK.Core.Internal.Utils
         private static TapLoom _current;
         private int _count;
 
-         private bool isPause = false;
+        private bool isPause = false;
+
+        // 记录主线程 ID
+        private static int _mainThreadId = -1;
+
         public static TapLoom Current
         {
             get
@@ -29,6 +33,7 @@ namespace TapSDK.Core.Internal.Utils
         {
             _current = this;
             initialized = true;
+            _mainThreadId = Thread.CurrentThread.ManagedThreadId;
         }
 
         static bool initialized;
@@ -80,6 +85,11 @@ namespace TapSDK.Core.Internal.Utils
             }
         }
 
+        /// <summary>
+        /// 在线程池中执行任务，非主线程
+        /// </summary>
+        /// <param name="a"> 任务 </param>
+        /// <returns></returns>
         public static Thread RunAsync(Action a)
         {
             Initialize();
@@ -92,6 +102,65 @@ namespace TapSDK.Core.Internal.Utils
             return null;
         }
 
+        /// <summary>
+        /// 阻塞式在主线程执行任务并返回值，当发生异常或超时时，返回默认值
+        /// </summary>
+        /// <param name="func"> 任务 </param>
+        /// <param name="defaultValue"> 默认值 </param>
+        /// <param name="timeout"> 超时时间，默认 100 毫秒</param>
+        /// <returns> 任务返回值或默认值 </returns>
+        public static object RunOnMainThreadSync(
+            Func<object> func,
+            object defaultValue,
+            int timeout = 100
+        )
+        {
+            // 主线程未就绪,直接返回默认值
+            if (_mainThreadId < 0)
+            {
+                return defaultValue;
+            }
+            // 已经在主线程，直接执行
+            if (Thread.CurrentThread.ManagedThreadId == _mainThreadId)
+            {
+                return func();
+            }
+            object result = defaultValue;
+            var evt = new ManualResetEvent(false);
+            try
+            {
+                QueueOnMainThread(() =>
+                {
+                    try
+                    {
+                        result = func();
+                    }
+                    catch (Exception ex)
+                    {
+                        TapLogger.Error("RunOnMainThreadSync failed " + ex.Message);
+                    }
+                    finally
+                    {
+                        try
+                        {
+                            evt.Set();
+                        }
+                        catch (ObjectDisposedException)
+                        {
+                            // evt 已被释放，直接忽略
+                        }
+                    }
+                });
+
+                evt.WaitOne(timeout);
+            }
+            finally
+            {
+                evt.Dispose(); // WaitOne 返回后再 Dispose
+            }
+            return result;
+        }
+
         private static void RunAction(object action)
         {
             try

package/Runtime/Public/TapTapSDK.cs

@@ -12,7 +12,7 @@ using System.ComponentModel;
 
 namespace TapSDK.Core {
     public class TapTapSDK {
-        public static readonly string Version = "4.9.0";
+        public static readonly string Version = "4.9.2";
         
         public static string SDKPlatform = "TapSDK-Unity";
 
@@ -38,11 +38,12 @@ namespace TapSDK.Core {
         {
             if (coreOption == null)
                 throw new ArgumentException("[TapSDK] options is null!");
+
             TapTapSDK.taptapSdkOptions = coreOption;
             TapLog.Enabled = coreOption.enableLog;
             platformWrapper?.Init(coreOption);
-            // 初始化各个模块
 
+            // 初始化各个模块
             Type[] initTaskTypes = GetInitTypeList();
             if (initTaskTypes != null)
             {
@@ -59,7 +60,6 @@ namespace TapSDK.Core {
                 }
             }
             TapTapEvent.Init(HandleEventOptions(coreOption));
-
         }
 
         public static void Init(TapTapSdkOptions coreOption, TapTapSdkBaseOptions[] otherOptions)
@@ -72,6 +72,7 @@ namespace TapSDK.Core {
             platformWrapper?.Init(coreOption, otherOptions);
 
 
+
             Type[] initTaskTypes = GetInitTypeList();
             if (initTaskTypes != null)
             {

package/Runtime/Public/TapTapSdkOptions.cs

@@ -112,7 +112,7 @@ namespace TapSDK.Core
         /// <summary>
         /// 屏幕方向：0-竖屏 1-横屏
         /// </summary>
-        public int screenOrientation = 0;
+        public int screenOrientation = 1;
 
         [JsonProperty("moduleName")]
         private string _moduleName = "TapTapSDKCore";

package/Standalone/Runtime/Internal/Http/TapHttpUtils.cs

@@ -84,7 +84,7 @@ namespace TapSDK.Core.Standalone.Internal.Http
 
         internal static string GenerateLanguage()
         {
-            return Tracker.getServerLanguage();
+            return TapLocalizeManager.GetCurrentLanguageString();
         }
 
         internal static string GenerateDeviceId()

package/Standalone/Runtime/Internal/Openlog/TapOpenlogStandalone.cs

@@ -202,7 +202,7 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             // 芯片型号，eg：Qualcomm Technologies, Inc SM7250
             generalParameter[TapOpenlogParamConstants.PARAM_HARDWARE] = SystemInfo.processorType;
             // SDK设置的地区，例如 zh_CN
-            generalParameter[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = Tracker.getServerLanguage();
+            generalParameter[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = TapLocalizeManager.GetCurrentLanguageString();
             // taptap的用户ID的外显ID（加密）
             generalParameter[TapOpenlogParamConstants.PARAM_OPEN_ID] = openid;
         }
@@ -227,7 +227,7 @@ namespace TapSDK.Core.Standalone.Internal.Openlog
             // 网络类型，eg：wifi, mobile
             props[TapOpenlogParamConstants.PARAM_NETWORK_TYPE] = "";
             // SDK设置的地区，例如 zh_CN
-            props[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = Tracker.getServerLanguage();
+            props[TapOpenlogParamConstants.PARAM_SDK_LOCALE] = TapLocalizeManager.GetCurrentLanguageString();
             return props;
         }
     }

package/{Runtime/Public → Standalone/Runtime/Internal}/TapLocalizeManager.cs

@@ -1,6 +1,8 @@
+using System.Threading;
+using TapSDK.Core.Internal.Utils;
 using UnityEngine;
 
-namespace TapSDK.Core
+namespace TapSDK.Core.Standalone
 {
     public class TapLocalizeManager
     {
@@ -24,7 +26,6 @@ namespace TapSDK.Core
             }
         }
 
-        private TapTapLanguageType _language = TapTapLanguageType.Auto;
         private bool _regionIsCn;
 
         public static void SetCurrentRegion(bool isCn)
@@ -32,6 +33,8 @@ namespace TapSDK.Core
             Instance._regionIsCn = isCn;
         }
 
+        private TapTapLanguageType _language = TapTapLanguageType.Auto;
+
         public static void SetCurrentLanguage(TapTapLanguageType language)
         {
             Instance._language = language;
@@ -39,14 +42,7 @@ namespace TapSDK.Core
 
         public static TapTapLanguageType GetCurrentLanguage()
         {
-            if (Instance._language != TapTapLanguageType.Auto) return Instance._language;
-            Instance._language = GetSystemLanguage();
-            if (Instance._language == TapTapLanguageType.Auto)
-            {
-                Instance._language = Instance._regionIsCn ? TapTapLanguageType.zh_Hans : TapTapLanguageType.en;
-            }
-
-            return Instance._language;
+            return Instance._language != TapTapLanguageType.Auto ? Instance._language : GetSystemLanguage();
         }
 
         public static string GetCurrentLanguageString() {
@@ -66,37 +62,38 @@ namespace TapSDK.Core
                     return "th_TH";
                 case TapTapLanguageType.id:
                     return "id_ID";
+                case TapTapLanguageType.de:
+                    return "de";
+                case TapTapLanguageType.es:
+                    return "es_ES";
+                case TapTapLanguageType.fr:
+                    return "fr";
+                case TapTapLanguageType.pt:
+                    return "pt_PT";
+                case TapTapLanguageType.ru:
+                    return "ru";
+                case TapTapLanguageType.tr:
+                    return "tr";
+                case TapTapLanguageType.vi:
+                    return "vi_VN";
                 default:
-                    return null;
+                    return Instance._regionIsCn ? "zh_CN" : "en_US";
             }
         }
 
         public static string GetCurrentLanguageString2() {
-            TapTapLanguageType lang = GetCurrentLanguage();
-            switch (lang) {
-                case TapTapLanguageType.zh_Hans:
-                    return "zh-CN";
-                case TapTapLanguageType.en:
-                    return "en-US";
-                case TapTapLanguageType.zh_Hant:
-                    return "zh-TW";
-                case TapTapLanguageType.ja:
-                    return "ja-JP";
-                case TapTapLanguageType.ko:
-                    return "ko-KR";
-                case TapTapLanguageType.th:
-                    return "th-TH";
-                case TapTapLanguageType.id:
-                    return "id-ID";
-                default:
-                    return null;
-            }
+            return GetCurrentLanguageString().Replace("_", "-");
         }
 
         private static TapTapLanguageType GetSystemLanguage()
         {
             var lang = TapTapLanguageType.Auto;
-            var sysLanguage = Application.systemLanguage;
+            // Application.systemLanguage 必须在主线程访问，所以这里需要使用 TapLoom 确保调用线程
+            var defaultSystemLanguage = Instance._regionIsCn ? SystemLanguage.ChineseSimplified : SystemLanguage.English;
+            var sysLanguage = TapLoom.RunOnMainThreadSync(
+                () => Application.systemLanguage,
+                defaultSystemLanguage
+            );
             switch (sysLanguage)
             {
                 case SystemLanguage.ChineseSimplified:
@@ -120,6 +117,9 @@ namespace TapSDK.Core
                 case SystemLanguage.Indonesian:
                     lang = TapTapLanguageType.id;
                     break;
+                default:
+                    lang = Instance._regionIsCn ? TapTapLanguageType.zh_Hans : TapTapLanguageType.en;
+                    break;
             }
 
             return lang;

package/Standalone/Runtime/Internal/Tracker.cs

@@ -127,7 +127,7 @@ namespace TapSDK.Core.Standalone.Internal {
 
             props["is_automatically_log"] = isAutomationlly ? "true" : "false";
 
-            var language = getServerLanguage();
+            var language = TapLocalizeManager.GetCurrentLanguageString();
             props["sdk_locale"] = language;
             props["lang_system"] = DeviceInfo.GetLanguage();
 
@@ -240,43 +240,6 @@ namespace TapSDK.Core.Standalone.Internal {
             }
         }
 
-        public static string getServerLanguage() {
-            // 将 TapCoreStandalone.coreOptions.preferredLanguage 转成 zh_TW/en/zh_CN/en_GB/jp/fil 等格式
-            switch (TapCoreStandalone.coreOptions.preferredLanguage) {
-                case TapTapLanguageType.zh_Hans:
-                    return "zh_CN";
-                case TapTapLanguageType.zh_Hant:
-                    return "zh_TW";
-                case TapTapLanguageType.en:
-                    return "en_US";
-                case TapTapLanguageType.ja:
-                    return "ja_JP";
-                case TapTapLanguageType.ko:
-                    return "ko_KR";
-                case TapTapLanguageType.th:
-                    return "th_TH";
-                case TapTapLanguageType.id:
-                    return "id_ID";
-                case TapTapLanguageType.de:
-                    return "de";
-                case TapTapLanguageType.es:
-                    return "es_ES";
-                case TapTapLanguageType.fr:
-                    return "fr";
-                case TapTapLanguageType.pt:
-                    return "pt_PT";
-                case TapTapLanguageType.ru:
-                    return "ru";
-                case TapTapLanguageType.tr:
-                    return "tr";
-                case TapTapLanguageType.vi:
-                    return "vi_VN";
-                default:
-                // 默认cn返回简体中文，Overseas返回英文
-                    return TapCoreStandalone.coreOptions.region == TapTapRegionType.CN ? "zh_CN" : "en_US";
-            }
-        }
-
         private string Network {
             get {
                 switch (Application.internetReachability) {

package/Standalone/Runtime/Public/TapCoreStandalone.cs

@@ -70,8 +70,12 @@ namespace TapSDK.Core.Standalone
                 TapVerifyInitStateUtils.ShowVerifyErrorMsg("clientToken 不能为空", "clientToken 不能为空");
                 return;
             }
+
             TapLog.Log("SDK Init Options : ", "coreOption : " + JsonConvert.SerializeObject(coreOption) + "\notherOptions : " + JsonConvert.SerializeObject(otherOptions));
             coreOptions = coreOption;
+            // 设置区域与语言
+            TapLocalizeManager.SetCurrentRegion(coreOption.region == TapTapRegionType.CN);
+            TapLocalizeManager.SetCurrentLanguage(coreOption.preferredLanguage);
             if (Prefs == null)
             {
                 Prefs = new Prefs();
@@ -123,6 +127,7 @@ namespace TapSDK.Core.Standalone
             }
             TapLog.Log("UpdateLanguage called with language: " + language);
             coreOptions.preferredLanguage = language;
+            TapLocalizeManager.SetCurrentLanguage(language);
         }
 
         public static string getGatekeeperConfigUrl(string key)

package/package.json

@@ -2,7 +2,7 @@
     "name": "com.taptap.sdk.core",
     "displayName": "TapTapSDK Core",
     "description": "TapTapSDK Core",
-    "version": "4.9.0",
+    "version": "4.9.2",
     "unity": "2019.4",
     "license": "MIT",
     "dependencies": {