update 1.1.25

This commit is contained in:
2024-03-12 02:17:14 +08:00
parent 5a00a4438a
commit 1a9e55a8a3
346 changed files with 1902 additions and 4759 deletions

View File

@@ -20,7 +20,6 @@ namespace AnyThink.Scripts.Editor
private static string PropertyDexingArtifactTransform = "android.enableDexingArtifactTransform";
private static string DisableProperty = "=false";
private static string KeyMetaDataAppLovinVerboseLoggingOn = "applovin.sdk.verbose_logging";
private static string KeyMetaDataGoogleApplicationId = "com.google.android.gms.ads.APPLICATION_ID";
private static string KeyMetaDataGoogleAdManagerApp = "com.google.android.gms.ads.AD_MANAGER_APP";
@@ -73,7 +72,7 @@ namespace AnyThink.Scripts.Editor
//如果是国内则根据选择来决定是否用AndroidX
if (isChina)
{
if (!ATPluginSetting.Instance.EnableAndroidX) {
if (!ATConfig.enableAndroidX()) {
EnableProperty = "=false";
} else {
EnableProperty = "=true";
@@ -145,14 +144,15 @@ namespace AnyThink.Scripts.Editor
private static void addGoogleApplicationIdIfNeeded(XElement elementApplication, IEnumerable<XElement> metaDataElements)
{
var googleApplicationIdMetaData = GetElementByName(metaDataElements, KeyMetaDataGoogleApplicationId);
if (!ATConfig.isAndroidNetworkInstalled("Admob", ATConfig.NONCHINA_COUNTRY))
if (!ATConfig.isNetworkInstalledByName("Admob", ATConfig.OS_ANDROID))
{
ATLog.log("addGoogleApplicationIdIfNeeded() >>> Admob not install.");
if (googleApplicationIdMetaData != null) googleApplicationIdMetaData.Remove();
return;
}
var appId = ATPluginSetting.Instance.AdMobAndroidAppId;
var appId = ATConfig.getAdmobAppIdByOs(ATConfig.OS_ANDROID);
// Log error if the App ID is not set.
if (string.IsNullOrEmpty(appId) || !appId.StartsWith("ca-app-pub-"))
{