diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj.meta
deleted file mode 100644
index 3799ae0..0000000
--- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 204d1c2a7960e48ceaee45173764f175
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/anythink_network_unity_csj.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/anythink_network_unity_csj.aar
deleted file mode 100644
index 3f230a6..0000000
Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/anythink_network_unity_csj.aar and /dev/null differ
diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/anythink_network_unity_csj.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/anythink_network_unity_csj.aar.meta
deleted file mode 100644
index 8c3c7a6..0000000
--- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/anythink_network_unity_csj.aar.meta
+++ /dev/null
@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 90dd56ba21d3f46ce8799318c4c697f6
-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/csj/open_ad_sdk_pro_5.6.1.5.aar b/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_pro_5.6.1.5.aar
deleted file mode 100644
index f1e05b2..0000000
Binary files a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_pro_5.6.1.5.aar and /dev/null differ
diff --git a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_pro_5.6.1.5.aar.meta b/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_pro_5.6.1.5.aar.meta
deleted file mode 100644
index ce97c31..0000000
--- a/Assets/AnyThinkAds/Plugins/Android/China/mediation/csj/open_ad_sdk_pro_5.6.1.5.aar.meta
+++ /dev/null
@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 1be98f3eccf7b457983f9ffec542cf50
-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/iOS/csj.meta b/Assets/AnyThinkAds/Plugins/iOS/csj.meta
deleted file mode 100644
index a40cead..0000000
--- a/Assets/AnyThinkAds/Plugins/iOS/csj.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b533b0baca6984f16a738a8aa8e025e1
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/AnyThinkAds/Plugins/iOS/csj/Editor.meta b/Assets/AnyThinkAds/Plugins/iOS/csj/Editor.meta
deleted file mode 100644
index 5a0dbe2..0000000
--- a/Assets/AnyThinkAds/Plugins/iOS/csj/Editor.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 943b13c22974c4fe7ba4c6d1244a21d7
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/AnyThinkAds/Plugins/iOS/csj/Editor/Dependencies.xml b/Assets/AnyThinkAds/Plugins/iOS/csj/Editor/Dependencies.xml
deleted file mode 100644
index dfd1b04..0000000
--- a/Assets/AnyThinkAds/Plugins/iOS/csj/Editor/Dependencies.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/Assets/AnyThinkAds/Plugins/iOS/csj/Editor/Dependencies.xml.meta b/Assets/AnyThinkAds/Plugins/iOS/csj/Editor/Dependencies.xml.meta
deleted file mode 100644
index cfbd461..0000000
--- a/Assets/AnyThinkAds/Plugins/iOS/csj/Editor/Dependencies.xml.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5d946ae84d7ee45dea6ccc6a9175ea8f
-TextScriptImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
index aa41dd9..e4c36d2 100644
--- a/Assets/Plugins/Android/mainTemplate.gradle
+++ b/Assets/Plugins/Android/mainTemplate.gradle
@@ -8,6 +8,9 @@
maven {
url "https://artifact.bytedance.com/repository/pangle" // Assets/AnyThinkAds/Plugins/Android/China/Editor/Gromore/Dependencies.xml:6
}
+ maven {
+ url "https://jfrog.anythinktech.com/artifactory/debugger" // Assets/Topon_Adapter/Editor/ToponTestDependencies.xml:6
+ }
mavenLocal()
mavenCentral()
}
@@ -20,13 +23,9 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
// Android Resolver Dependencies Start
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.anythink.sdk:debugger-ui:1.0.0' // Assets/Topon_Adapter/Editor/ToponTestDependencies.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
**DEPS**}
diff --git a/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs b/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs
index 0a8ea96..9c82ec7 100644
--- a/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs
+++ b/Assets/Topon_Adapter/Editor/AD_BuildAndroidProcess.cs
@@ -23,14 +23,17 @@ namespace Topon_Adapter.Editor
{
#if UNITY_2019_3_OR_NEWER
var manifestPath = Path.Combine(path, "src/main/AndroidManifest.xml");
+ var launcherManifestPath = Path.Combine(path, "../launcher/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;
+ XDocument launcherManifest;
try
{
- manifest = XDocument.Load(manifestPath);
+ manifest = XDocument.Load(manifestPath);
+ launcherManifest = XDocument.Load (launcherManifestPath);
}
#pragma warning disable 0168
catch (IOException exception)
@@ -55,11 +58,19 @@ namespace Topon_Adapter.Editor
return;
}
- elementManifest.Add(CreateQueries());
+ var queries = CreateQueries();
+ elementManifest.Add(queries);
elementApplication.Add(CreateActivityXML());
+
+
+ var elementlauncherManifest = launcherManifest.Element("manifest");
+ var elementlauncherApplication = elementlauncherManifest.Element("application");
+ //增加穿山甲配置
+ elementlauncherApplication.Add (CreateCSJGromore ());
// Save the updated manifest file.
manifest.Save(manifestPath);
+ launcherManifest.Save (launcherManifestPath);
}
///
@@ -87,6 +98,37 @@ namespace Topon_Adapter.Editor
return metaData;
}
+
+ public static XElement CreateCSJGromore ()
+ {
+ // ReSharper disable once InvalidXmlDocComment
+ /**
+ *
+
+
+ *
+ */
+ var providerData = new XElement("provider");
+
+ providerData.Add (new XAttribute (AndroidNamespace + "name" , "com.bytedance.sdk.openadsdk.TTFileProvider"));
+ providerData.Add (new XAttribute (AndroidNamespace + "authorities" , "${applicationId}.TTFileProvider"));
+ providerData.Add (new XAttribute (AndroidNamespace + "exported" , "false"));
+ providerData.Add (new XAttribute (AndroidNamespace + "grantUriPermissions" , "true"));
+ providerData.Add (new XAttribute (ToolsNamespace + "replace" , "android:authorities"));
+ var metaData = new XElement("meta-data");
+ metaData.Add (new XAttribute (AndroidNamespace+"name" , "android.support.FILE_PROVIDER_PATHS"));
+ metaData.Add (new XAttribute (AndroidNamespace+"resource" , "@xml/alex_tt_file_path"));
+ providerData.Add (metaData);
+ return providerData;
+ }
+
public int callbackOrder { get; }
}
}
diff --git a/Assets/Topon_Adapter/Editor/ToponTestDependencies.xml b/Assets/Topon_Adapter/Editor/ToponTestDependencies.xml
new file mode 100644
index 0000000..90feb09
--- /dev/null
+++ b/Assets/Topon_Adapter/Editor/ToponTestDependencies.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ https://jfrog.anythinktech.com/artifactory/debugger
+
+
+
+
+
+
diff --git a/Assets/Topon_Adapter/Editor/ToponTestDependencies.xml.meta b/Assets/Topon_Adapter/Editor/ToponTestDependencies.xml.meta
new file mode 100644
index 0000000..1857c57
--- /dev/null
+++ b/Assets/Topon_Adapter/Editor/ToponTestDependencies.xml.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a130901ed98e40898c3917a08e126996
+timeCreated: 1697702311
\ No newline at end of file
diff --git a/Assets/Topon_Adapter/Runtime/Scripts/ToponAdController.cs b/Assets/Topon_Adapter/Runtime/Scripts/ToponAdController.cs
index a1740a7..eed7125 100644
--- a/Assets/Topon_Adapter/Runtime/Scripts/ToponAdController.cs
+++ b/Assets/Topon_Adapter/Runtime/Scripts/ToponAdController.cs
@@ -1,6 +1,7 @@
using System;
using AnyThinkAds.Api;
using Runtime.ADAggregator;
+using UnityEngine;
public class ToponAdController : IAdController
{
@@ -14,8 +15,13 @@ public class ToponAdController : IAdController
_adConfig = adConfig;
// ATSdkUtil.
ATSDKAPI.setChannel(args[0].ToString());
- ATSDKAPI.setLogDebug(args.Length > 1 && (bool)args[1]);
+ var isDebug = args.Length > 1 && (bool)args[1];
+ ATSDKAPI.setLogDebug(isDebug);
ATSDKAPI.initSDK(adConfig.Id , adConfig.Key);
+ if (isDebug)
+ {
+ ShowAndroidTest ();
+ }
}
public void SetListener(Action adMaskAction ,Action logEventAction)
@@ -49,4 +55,25 @@ public class ToponAdController : IAdController
{
_maskAction?.Invoke(isOpen);
}
+
+ private void ShowAndroidTest ()
+ {
+ // com.anythink.debug.api.ATDebuggerUITest.showDebuggerUI(this);
+#if UNITY_EDITOR
+ return;
+#elif UNITY_ANDROID
+ //获取Unity的Activity Class
+ using (AndroidJavaClass activityClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
+ {
+ //获取对应的实例化对象,这两句都是固定写法
+ using (AndroidJavaObject activityContext = activityClass.GetStatic("currentActivity"))
+ {
+ //拿到我自己的工具类并实例化
+ var testUtils = new AndroidJavaClass("com.anythink.debug.api.ATDebuggerUITest");
+ //向工具类里的Init方法传入Unity的activity对象用于初始化工具类
+ testUtils.CallStatic("showDebuggerUI", activityContext);
+ }
+ }
+#endif
+ }
}
\ No newline at end of file
diff --git a/Assets/package.json b/Assets/package.json
index 0e2d753..b1238ee 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.15",
+ "version": "1.0.16",
"unity": "2021.1",
"license": "MIT",
"repository": {
diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml
index eca0cda..e390726 100644
--- a/ProjectSettings/AndroidResolverDependencies.xml
+++ b/ProjectSettings/AndroidResolverDependencies.xml
@@ -1,13 +1,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.anythink.sdk:debugger-ui:1.0.0
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