From 06f54f15b35b73b70d1a9c173c3d9e88edcb328c Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 10 Mar 2021 14:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=85=8D=E7=BD=AE=E3=80=91=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=80=81=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/ServerConfigManager.lua | 8 ++++++++ .../DataCenterService/ThinkingAnalyticsManager.lua | 4 +++- Assets/ManagedResources/~Lua/misc/functions.lua | 4 +++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 99c41ee0ab..f4247b4c9d 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -63,4 +63,12 @@ function ServerConfigManager.GetConfigInfo(key) local s = ConfigMgr:GetConfigInfo(key) return s end +end + + +function ServerConfigManager.GetSDKVersionCode() + if AppConst.isSDK then + return AndroidDeviceInfo.Instance:GetVersionCode() + end + return 9999 end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua index c6a78d8d63..a80ad82a9c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DataCenterService/ThinkingAnalyticsManager.lua @@ -71,7 +71,9 @@ end -- 获取设备Id function this.GetDeviceId() if AppConst.isSDK then - if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.ThinkAnalysis_GetDeviceID) then + if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.ThinkAnalysis_GetDeviceID) + or ServerConfigManager.GetSDKVersionCode() >= 24 + then return App.TAMgr:GetDeviceId() end return AndroidDeviceInfo.Instance:GetDeviceID() diff --git a/Assets/ManagedResources/~Lua/misc/functions.lua b/Assets/ManagedResources/~Lua/misc/functions.lua index a003de5e3f..5de6bfed7c 100644 --- a/Assets/ManagedResources/~Lua/misc/functions.lua +++ b/Assets/ManagedResources/~Lua/misc/functions.lua @@ -67,7 +67,9 @@ function GetPreferredWidth(_transform) end function ForceRebuildLayout(_transform) - if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.LayoutBuilderWrap) then + if ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.LayoutBuilderWrap) + or ServerConfigManager.GetSDKVersionCode() >= 25 + then if not LayoutRebuilder then LayoutRebuilder = UnityEngine.UI.LayoutRebuilder end