diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_5.4.1.6.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_5.4.1.6.aar deleted file mode 100644 index 1a70bc8..0000000 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_5.4.1.6.aar and /dev/null differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_5.4.1.6.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_5.4.1.6.aar.meta deleted file mode 100644 index 73d58e9..0000000 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_5.4.1.6.aar.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: 5931f1f57fd9a4414be7508e413219e2 -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: diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.540.1410.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.540.1410.aar deleted file mode 100644 index b2e9d02..0000000 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.540.1410.aar and /dev/null differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.540.1410.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.540.1410.aar.meta deleted file mode 100644 index 9b91978..0000000 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/gdt/GDTSDK.unionNormal.4.540.1410.aar.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: 727c8d0c38d5c45698625e7047fa202f -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: diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.51.1-publishRelease-97f3383ba2.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.51.1-publishRelease-97f3383ba2.aar deleted file mode 100644 index fae8956..0000000 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.51.1-publishRelease-97f3383ba2.aar and /dev/null differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.51.1-publishRelease-97f3383ba2.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.51.1-publishRelease-97f3383ba2.aar.meta deleted file mode 100644 index ea43f7f..0000000 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-3.3.51.1-publishRelease-97f3383ba2.aar.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: edd3f0c5204174a9c90fe7fd5df5a017 -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: diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.13_mediationh2.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.13_mediationh2.aar deleted file mode 100644 index c7eb9f0..0000000 Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.13_mediationh2.aar and /dev/null differ diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.13_mediationh2.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.13_mediationh2.aar.meta deleted file mode 100644 index 16ee656..0000000 --- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/TapAD_3.16.3.13_mediationh2.aar.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: 7c811f47b950b4838a64832d816e897d -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: diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index d75b7eb..aa41dd9 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -22,8 +22,9 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' // Assets/AnyThinkAds/Plugins/Android/China/Editor/Dependencies.xml:3 implementation 'com.android.support:design:28.0.0' // Assets/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml:3 implementation 'com.github.bumptech.glide:glide:4.9.0' // Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml:6 - implementation 'com.pangle.cn:mediation-sdk:5.6.0.8' // Assets/AnyThinkAds/Plugins/Android/China/Editor/Gromore/Dependencies.xml:8 + implementation 'com.pangle.cn:mediation-sdk:5.6.1.6' // Assets/AnyThinkAds/Plugins/Android/China/Editor/Gromore/Dependencies.xml:8 implementation 'com.squareup.okhttp3:okhttp:3.12.1' // Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml:5 + implementation 'com.tencent.mm.opensdk:wechat-sdk-android:6.8.0' // Assets/Topon_Adapter/Editor/WXDependencies.xml:3 implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' // Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml:4 implementation 'io.reactivex.rxjava2:rxjava:2.0.1' // Assets/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml:3 // Android Resolver Dependencies End diff --git a/Assets/Topon_Adapter/Editor.meta b/Assets/Topon_Adapter/Editor.meta new file mode 100644 index 0000000..60ef446 --- /dev/null +++ b/Assets/Topon_Adapter/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ffa17b4d22a08804794a574856906799 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs b/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs new file mode 100644 index 0000000..0a8ea96 --- /dev/null +++ b/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs @@ -0,0 +1,94 @@ +#if UNITY_ANDROID +using System.IO; +using System.Xml.Linq; +using UnityEngine; +using UnityEditor; +using UnityEditor.Android; + +namespace Topon_Adapter.Editor +{ + public class AD_BuildAndroidProcess : IPostGenerateGradleAndroidProject + { + private static readonly XNamespace AndroidNamespace = "http://schemas.android.com/apk/res/android"; + private static readonly XNamespace ToolsNamespace = "http://schemas.android.com/tools"; + + + public void OnPostGenerateGradleAndroidProject(string path) + { + ProcessAndroidManifest(path); + } + + + public static void ProcessAndroidManifest(string path) + { +#if UNITY_2019_3_OR_NEWER + var manifestPath = Path.Combine(path, "src/main/AndroidManifest.xml"); +#else + var manifestPath = Path.Combine(path, "unityLibrary/src/main/AndroidManifest.xml"); +#endif + // var manifestPath = Path.Combine(path, "src/main/AndroidManifest.xml"); + XDocument manifest; + try + { + manifest = XDocument.Load(manifestPath); + } +#pragma warning disable 0168 + catch (IOException exception) +#pragma warning restore 0168 + { + ATLog.log("[BuildAndroidProcess] AndroidManifest.xml is missing."); + return; + } + + // Get the `manifest` element. + var elementManifest = manifest.Element("manifest"); + if (elementManifest == null) + { + ATLog.log("[BuildAndroidProcess] AndroidManifest.xml is invalid."); + return; + } + + var elementApplication = elementManifest.Element("application"); + if (elementApplication == null) + { + ATLog.log("[BuildAndroidProcess] AndroidManifest.xml is invalid."); + return; + } + + elementManifest.Add(CreateQueries()); + elementApplication.Add(CreateActivityXML()); + + // Save the updated manifest file. + manifest.Save(manifestPath); + } + + /// + /// 增加微信开放平台的适配 + /// + public static XElement CreateActivityXML() + { + + var metaData = new XElement("activity"); + metaData.Add(new XAttribute(AndroidNamespace + "name", ".wxapi.WXEntryActivity")); + metaData.Add(new XAttribute(AndroidNamespace + "label", "@string/app_name")); + metaData.Add(new XAttribute(AndroidNamespace + "theme", "@android:style/Theme.Translucent.NoTitleBar")); + metaData.Add(new XAttribute(AndroidNamespace + "exported", "true")); + metaData.Add(new XAttribute(AndroidNamespace + "taskAffinity", Application.identifier)); + metaData.Add(new XAttribute(AndroidNamespace + "launchMode", "singleTask")); + return metaData; + } + + public static XElement CreateQueries() + { + var metaData = new XElement("queries"); + var packageData = new XElement("package"); + packageData.Add(new XAttribute(AndroidNamespace + "name", "com.tencent.mm")); + metaData.Add(packageData); + return metaData; + } + + public int callbackOrder { get; } + } +} + +#endif \ No newline at end of file diff --git a/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs.meta b/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs.meta new file mode 100644 index 0000000..35695d7 --- /dev/null +++ b/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f093a7f66c4f4560a3d06bcf236bc89a +timeCreated: 1697048746 \ No newline at end of file diff --git a/Assets/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef b/Assets/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef new file mode 100644 index 0000000..40959b4 --- /dev/null +++ b/Assets/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef @@ -0,0 +1,19 @@ +{ + "name": "Topon_Adapter.Editor", + "rootNamespace": "", + "references": [ + "GUID:8a3d1447e0a3bdf4fa07035516da8b62", + "GUID:483a01338fa974b4498cd71261d6e8b9" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef.meta b/Assets/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef.meta new file mode 100644 index 0000000..af0c6f2 --- /dev/null +++ b/Assets/Topon_Adapter/Editor/Topon_Adapter.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4ea29d77d0952884eac16339c279a985 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Topon_Adapter/Editor/WXDependencies.xml b/Assets/Topon_Adapter/Editor/WXDependencies.xml new file mode 100644 index 0000000..d55d49f --- /dev/null +++ b/Assets/Topon_Adapter/Editor/WXDependencies.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Assets/Topon_Adapter/Editor/WXDependencies.xml.meta b/Assets/Topon_Adapter/Editor/WXDependencies.xml.meta new file mode 100644 index 0000000..21899aa --- /dev/null +++ b/Assets/Topon_Adapter/Editor/WXDependencies.xml.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ee2de7a1fe734e3599d92016611fc247 +timeCreated: 1697050926 \ No newline at end of file diff --git a/Assets/package.json b/Assets/package.json index 1759420..c36f9dc 100644 --- a/Assets/package.json +++ b/Assets/package.json @@ -2,7 +2,7 @@ "name": "com.commercialization.topon", "displayName": "Commercialization.topon", "description": "基于topon的广告sdk封装，依赖基础商业化模块", - "version": "1.0.10", + "version": "1.0.9", "unity": "2021.1", "license": "MIT", "repository": { @@ -16,7 +16,7 @@ }, "dependencies": { - "com.foldcc.cc-framework.commercialization" : "http://private.lightyears.ltd:18640/foldcc/CC-Framework.Commercialization.git#1.0.9" + "com.foldcc.cc-framework.commercialization" : "http://private.lightyears.ltd:18640/foldcc/CC-Framework.Commercialization.git#1.0.5" }, "keywords": [ "Framework" diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index 0d680b7..eca0cda 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -3,8 +3,9 @@ com.android.support:appcompat-v7:28.0.0 com.android.support:design:28.0.0 com.github.bumptech.glide:glide:4.9.0 - com.pangle.cn:mediation-sdk:5.6.0.8 + com.pangle.cn:mediation-sdk:5.6.1.6 com.squareup.okhttp3:okhttp:3.12.1 + com.tencent.mm.opensdk:wechat-sdk-android:6.8.0 io.reactivex.rxjava2:rxandroid:2.0.1 io.reactivex.rxjava2:rxjava:2.0.1