com.xd.sdk.oversea 7.3.4 → 7.6.1

package/Editor/XD.SDK.Oversea.Editor.asmdef

@@ -2,7 +2,7 @@
     "name": "XD.SDK.Oversea.Editor",
     "rootNamespace": "",
     "references": [
-        "GUID:11227cad437d44898c9c5389c8672caa"
+        "XD.SDK.Foundation.Editor"
     ],
     "includePlatforms": [
         "Editor"

package/Editor/XDOverseaAndroidGradleProcessor.cs

@@ -1,5 +1,8 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Xml.Linq;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
@@ -10,6 +13,18 @@ namespace XD.SDK.Oversea.Editor
 {
     public class XDOverseaAndroidGradleProcessor : XDAndroidProjectProcessor, IPreprocessBuildWithReport
     {
+        private const string RegionTypeGlobal = "global";
+        private const string FacebookActivityName = "com.facebook.FacebookActivity";
+        private const string FacebookCustomTabActivityName = "com.facebook.CustomTabActivity";
+        private const string FacebookContentProviderName = "com.facebook.FacebookContentProvider";
+        private const string FacebookContentProviderAuthorityPrefix = "com.facebook.app.FacebookContentProvider";
+        private const string FacebookApplicationIdMetaDataName = "com.facebook.sdk.ApplicationId";
+        private const string FacebookClientTokenMetaDataName = "com.facebook.sdk.ClientToken";
+        private const string AndroidConfigChanges = "keyboard|keyboardHidden|screenLayout|screenSize|orientation";
+        private const string AndroidActionView = "android.intent.action.VIEW";
+        private const string AndroidCategoryDefault = "android.intent.category.DEFAULT";
+        private const string AndroidCategoryBrowsable = "android.intent.category.BROWSABLE";
+        private static readonly XNamespace AndroidNs = "http://schemas.android.com/apk/res/android";
         
         public new int callbackOrder => 1050;
 
@@ -45,10 +60,7 @@ namespace XD.SDK.Oversea.Editor
         {
             var result = new List<AndroidGradleProjectConfig.Dependency>
             {
-                // 添加基础依赖
-                new AndroidGradleProjectConfig.Dependency(group: "com.google.android.gms", module: "play-services-ads-identifier", version: VersionCatalog.GoogleAdsIdentifier),
-                new AndroidGradleProjectConfig.Dependency(group: "com.android.billingclient", module: "billing", version: VersionCatalog.BillingClient),
-                new AndroidGradleProjectConfig.Dependency(group: "androidx.browser", module: "browser", version: VersionCatalog.CustomTabsBrowser)
+                new AndroidGradleProjectConfig.Dependency(group: "com.xd.sdk.android", module: "analytics-global", version: VersionCatalog.XDAndroidSdkVersion),
             };
 
             // Firebase依赖
@@ -108,6 +120,180 @@ namespace XD.SDK.Oversea.Editor
             return result;
         }
 
+        protected override void OnProcessAndroidProject(string path)
+        {
+            base.OnProcessAndroidProject(path);
+            AddFacebookManifestConfig(path);
+        }
+
+        private void AddFacebookManifestConfig(string path)
+        {
+            if (!IsGlobalRegion()) return;
+
+            var facebookAppId = configModel?.facebook?.app_id;
+            if (string.IsNullOrWhiteSpace(facebookAppId)) return;
+            if (string.IsNullOrWhiteSpace(configModel?.facebook?.client_token))
+            {
+                Debug.LogWarning("XDConfig.json 中 facebook.client_token 为空，无法自动配置 Facebook ClientToken");
+            }
+
+            var androidManifest = Path.Combine(path, "src", "main", "AndroidManifest.xml");
+            if (!File.Exists(androidManifest))
+            {
+                Debug.LogWarning($"AndroidManifest.xml 文件不存在: {androidManifest}, 无法自动配置 Facebook");
+                return;
+            }
+
+            var manifest = XDocument.Load(androidManifest);
+            var applicationRoot = manifest
+                .Element("manifest")
+                ?.Element("application");
+            if (applicationRoot == null)
+            {
+                Debug.LogWarning("AndroidManifest.xml 文件格式不正确, 无法自动配置 Facebook");
+                return;
+            }
+
+            AddFacebookManifestConfig(applicationRoot, configModel);
+            manifest.Save(androidManifest);
+        }
+
+        internal static void AddFacebookManifestConfig(XElement applicationRoot, XDConfigModel configModel)
+        {
+            var facebookAppId = NormalizeFacebookAppId(configModel?.facebook?.app_id);
+            if (applicationRoot == null || string.IsNullOrEmpty(facebookAppId)) return;
+
+            AddOrUpdateMetaData(applicationRoot, FacebookApplicationIdMetaDataName, $"\\{facebookAppId}");
+            AddOrUpdateMetaData(applicationRoot, FacebookClientTokenMetaDataName, configModel?.facebook?.client_token);
+            AddOrUpdateFacebookActivity(applicationRoot, configModel?.game_name);
+            AddOrUpdateCustomTabActivity(applicationRoot, facebookAppId);
+            AddOrUpdateFacebookContentProvider(applicationRoot, facebookAppId);
+        }
+
+        private bool IsGlobalRegion()
+        {
+            return string.Equals(configModel?.region_type?.Trim(), RegionTypeGlobal, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private static void AddOrUpdateMetaData(XElement applicationRoot, string name, string value)
+        {
+            if (string.IsNullOrWhiteSpace(value)) return;
+
+            var metaData = applicationRoot.Elements("meta-data")
+                .FirstOrDefault(element => GetAndroidAttribute(element, "name") == name);
+            if (metaData == null)
+            {
+                metaData = new XElement("meta-data");
+                applicationRoot.Add(metaData);
+            }
+
+            SetAndroidAttribute(metaData, "name", name);
+            SetAndroidAttribute(metaData, "value", value.Trim());
+        }
+
+        private static string NormalizeFacebookAppId(string appId)
+        {
+            return appId?.Trim().TrimStart('\\');
+        }
+
+        private static void AddOrUpdateFacebookActivity(XElement applicationRoot, string gameName)
+        {
+            var activity = FindOrCreateActivity(applicationRoot, FacebookActivityName);
+            SetAndroidAttribute(activity, "configChanges", AndroidConfigChanges);
+            SetAndroidAttribute(activity, "label",
+                string.IsNullOrWhiteSpace(gameName) ? "@string/app_name" : gameName.Trim());
+        }
+
+        private static void AddOrUpdateCustomTabActivity(XElement applicationRoot, string facebookAppId)
+        {
+            var activity = FindOrCreateActivity(applicationRoot, FacebookCustomTabActivityName);
+            SetAndroidAttribute(activity, "configChanges", AndroidConfigChanges);
+            SetAndroidAttribute(activity, "exported", "true");
+
+            var intentFilter = activity.Elements("intent-filter")
+                .FirstOrDefault(IsCustomTabIntentFilter);
+            if (intentFilter == null)
+            {
+                intentFilter = new XElement("intent-filter");
+                activity.Add(intentFilter);
+            }
+
+            AddChildWithAndroidNameIfMissing(intentFilter, "action", AndroidActionView);
+            AddChildWithAndroidNameIfMissing(intentFilter, "category", AndroidCategoryDefault);
+            AddChildWithAndroidNameIfMissing(intentFilter, "category", AndroidCategoryBrowsable);
+            AddOrUpdateDataScheme(intentFilter, $"fb{facebookAppId}");
+        }
+
+        private static void AddOrUpdateFacebookContentProvider(XElement applicationRoot, string facebookAppId)
+        {
+            var provider = applicationRoot.Elements("provider")
+                .FirstOrDefault(element => GetAndroidAttribute(element, "name") == FacebookContentProviderName);
+            if (provider == null)
+            {
+                provider = new XElement("provider");
+                applicationRoot.Add(provider);
+            }
+
+            SetAndroidAttribute(provider, "name", FacebookContentProviderName);
+            SetAndroidAttribute(provider, "authorities", $"{FacebookContentProviderAuthorityPrefix}{facebookAppId}");
+            SetAndroidAttribute(provider, "exported", "true");
+        }
+
+        private static XElement FindOrCreateActivity(XElement applicationRoot, string activityName)
+        {
+            var activity = applicationRoot.Elements("activity")
+                .FirstOrDefault(element => GetAndroidAttribute(element, "name") == activityName);
+            if (activity != null) return activity;
+
+            activity = new XElement("activity");
+            SetAndroidAttribute(activity, "name", activityName);
+            applicationRoot.Add(activity);
+            return activity;
+        }
+
+        private static bool IsCustomTabIntentFilter(XElement intentFilter)
+        {
+            return HasChildWithAndroidName(intentFilter, "action", AndroidActionView)
+                   && HasChildWithAndroidName(intentFilter, "category", AndroidCategoryDefault)
+                   && HasChildWithAndroidName(intentFilter, "category", AndroidCategoryBrowsable);
+        }
+
+        private static bool HasChildWithAndroidName(XElement root, string childName, string name)
+        {
+            return root.Elements(childName).Any(element => GetAndroidAttribute(element, "name") == name);
+        }
+
+        private static void AddChildWithAndroidNameIfMissing(XElement root, string childName, string name)
+        {
+            if (HasChildWithAndroidName(root, childName, name)) return;
+
+            var child = new XElement(childName);
+            SetAndroidAttribute(child, "name", name);
+            root.Add(child);
+        }
+
+        private static void AddOrUpdateDataScheme(XElement intentFilter, string scheme)
+        {
+            var data = intentFilter.Elements("data").FirstOrDefault();
+            if (data == null)
+            {
+                data = new XElement("data");
+                intentFilter.Add(data);
+            }
+
+            SetAndroidAttribute(data, "scheme", scheme);
+        }
+
+        private static string GetAndroidAttribute(XElement element, string attributeName)
+        {
+            return (string)element.Attribute(AndroidNs + attributeName);
+        }
+
+        private static void SetAndroidAttribute(XElement element, string attributeName, string value)
+        {
+            element.SetAttributeValue(AndroidNs + attributeName, value);
+        }
+
         public void OnPreprocessBuild(BuildReport report)
         {
             // 删除旧版本添加的内容
@@ -118,4 +304,4 @@ namespace XD.SDK.Oversea.Editor
             if (File.Exists(targetPath)) File.Delete(targetPath);
         }
     }
-}
+}

package/Plugins/iOS/XDGlobalWrapper.framework/Headers/XDGlobalWrapper.h

@@ -15,6 +15,6 @@ FOUNDATION_EXPORT const unsigned char XDGlobalWrapperVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <XDGlobalWrapper/PublicHeader.h>
 
-#define XDGlobal_VERSION @"7.3.1"
-#define XDGlobal_VERSION_CODE @"7030100"
-// HASH e51483ce
+#define XDGlobal_VERSION @"7.6.1"
+#define XDGlobal_VERSION_CODE @"7060100"
+// HASH fbff8e7e

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "com.xd.sdk.oversea",
   "displayName": "XDGSDK Oversea",
-  "version": "7.3.4",
+  "version": "7.6.1",
   "description": "XDGSDK",
   "unity": "2019.3",
   "license": "MIT",
   "dependencies": {
-    "com.xd.sdk.common": "7.3.4"
+    "com.xd.sdk.common": "7.6.1"
   }
-}
+}

package/Plugins/Android/libs/XDGPushGlobal_7.3.3.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 6a5d89219f5a41628820d2c42b95b544
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 1
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Plugins/Android/libs/XDGThirdLogin_7.3.3.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 38236b5ea1a9478293ffde1a95ac870d
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Plugins/Android/libs/XDGThirdTrack_7.3.3.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 3c53804fb42c4e468c9d3d29eb75bc33
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: