6 Commits

Author SHA1 Message Date
9a8096f347 版本号更新 1.0.15 2023-10-19 15:49:37 +08:00
0f760ca1a5 update core 2023-10-19 15:45:11 +08:00
4ec2560f30 升级sdk
gromore => 5.6.1.0
Android => 5.2.72
2023-10-19 15:31:19 +08:00
Foldcc_Book
1d22a3dae0 1.0.12 2023-10-12 05:42:18 +08:00
Foldcc_Book
75730fb783 1.0.11 2023-10-12 05:20:31 +08:00
Foldcc_Book
38c9cabad2 1.0.10 2023-10-12 04:08:33 +08:00
63 changed files with 285 additions and 110 deletions

View File

@@ -1,4 +1,4 @@
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using AnyThinkAds.ThirdParty.LitJson;
@@ -36,7 +36,7 @@ namespace AnyThinkAds.Api
public readonly Dictionary<string, object> custom_rule;
public readonly Dictionary<string, object> ext_info;
public readonly string user_load_extra_data;
public readonly Dictionary<string, object> user_load_extra_data;
public readonly int abtest_id;
public readonly string reward_custom_data;
@@ -79,10 +79,11 @@ namespace AnyThinkAds.Api
abtest_id = int.Parse(jsonData.ContainsKey("abtest_id") ? jsonData["abtest_id"].ToString() : "0");
segment_id = int.Parse(jsonData.ContainsKey("segment_id") ? jsonData["segment_id"].ToString() : "0");
scenario_id = jsonData.ContainsKey("scenario_id") ? (string)jsonData["scenario_id"] : "";// RewardVideo & Interstitial
if (jsonData.ContainsKey("user_load_extra_data")) {
user_load_extra_data = jsonData.ContainsKey("user_load_extra_data") ? (string)jsonData["user_load_extra_data"] : "";
user_load_extra_data = JsonMapper.ToObject<Dictionary<string, object>>(jsonData["user_load_extra_data"].ToJson());
}
scenario_reward_name = jsonData.ContainsKey("scenario_reward_name") ? (string)jsonData["scenario_reward_name"] : "";
scenario_reward_number = int.Parse(jsonData.ContainsKey("scenario_reward_number") ? jsonData["scenario_reward_number"].ToString() : "0");

View File

@@ -77,7 +77,7 @@
NSMutableDictionary *extraDataTemp = [NSMutableDictionary dictionary];
NSMutableDictionary *extraDataDictM = [NSMutableDictionary dictionaryWithDictionary:extra[kATUnityUserExtraDataKey]];
for (NSString *key in extraDataDictM.allKeys) {
if ([extraDataDictM[key] isKindOfClass:[NSString class]] || [extraDataDictM[key] isMemberOfClass:[NSNumber class]]) {
if ([extraDataDictM[key] isKindOfClass:[NSString class]] || [extraDataDictM[key] isKindOfClass:[NSNumber class]]) {
[extraDataTemp setValue:extraDataDictM[key] forKey:key];
}
}

View File

@@ -59,8 +59,11 @@ NSString *const kATUnityCheckLoadModelAdInfoKey = @"adInfo";
[extraDictM removeObjectForKey:kATUnityUserExtraDataKey];
}
NSMutableDictionary *jsonDictM = [NSMutableDictionary dictionaryWithDictionary:self];
[jsonDictM setValue:extraDictM forKey:kATUnityCheckLoadModelAdInfoKey];
@try {
jsonData = [NSJSONSerialization dataWithJSONObject:extraDictM
jsonData = [NSJSONSerialization dataWithJSONObject:jsonDictM
options:kNilOptions
error:&error];
} @catch (NSException *exception) {

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: de346304da6da453fb4e4028ccfa87d9
guid: 8796f84f818a647e487c69b334805515
TextScriptImporter:
externalObjects: {}
userData:

View File

@@ -5,7 +5,7 @@
<repository>https://artifact.bytedance.com/repository/pangle</repository>
</repositories>
<androidPackage spec="com.pangle.cn:mediation-sdk:5.6.0.8"/>
<androidPackage spec="com.pangle.cn:mediation-sdk:5.6.1.6"/>
</androidPackages>
</dependencies>

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 33c67038f4c904d05bd0875c937fa880
guid: 2d2eadb320c6448a7a4d2f4e2b90b4da
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3af96bb77620145fb9abbd1844f5431f
guid: 48ab74722adda4a78a3cbdcaa8194930
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 81345eb1278404c50abd5f44ab66ccec
guid: ba760aa6a72eb4d4fa5b45d56a01eb88
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 65e41ebac4da64cdeab7d162d1212cac
guid: 3c51c213b59544f83af22c17ddb34baa
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7ad65e2aacd7a4428b74871d91234e4a
guid: 5cf0e27873d8640d58f965370b8e4894
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 80b54a91dd4004c8188635f7563c603c
guid: 582c425272e48470eaa96bbc41a19ada
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0585b7a575916456b90cbbe4efd2b060
guid: e1253ef962331451c920d9a9cfec5d64
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c8aa9f53a23284bf8b454b66a6c95826
guid: 69eadc53c9e9c476494b0ec77e3bd34f
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5931f1f57fd9a4414be7508e413219e2
guid: 58ce6fc3a28107d4499e97dc10ed1e1d
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 78fc81d88459b95429b1b1c2d4c95aea
guid: 5986569148d4f1e49a0df2f34c63efad
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 727c8d0c38d5c45698625e7047fa202f
guid: 1be98f3eccf7b457983f9ffec542cf50
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8d1f8a77e8a050949b1e0f6b05261c29
guid: 94368ec5422bd4575a0b4ad522567a4d
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -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:

View File

@@ -0,0 +1,32 @@
fileFormatVersion: 2
guid: 80a5bbbaf1fad4dd88c90ee3798b404f
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:

View File

@@ -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:

View File

@@ -0,0 +1,32 @@
fileFormatVersion: 2
guid: 705059be7aa1e47198560d85adf4fa3f
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:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2447e3291333c443d98e4082e5478186
guid: 4c4732d77f090499fbcd167c6616152a
PluginImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -0,0 +1,32 @@
fileFormatVersion: 2
guid: 24372970098b1434487fb81880cf5f34
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:

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><dependencies>
<iosPods>
<iosPod name="AnyThinkiOS" version="6.2.51" />
<iosPod name="AnyThinkiOS" version="6.2.68" />
</iosPods>
</dependencies>

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1ffafae492aad463b9880d1660c1743e
guid: 254348f606df14748ad325e21335c624
TextScriptImporter:
externalObjects: {}
userData:

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><dependencies>
<iosPods>
<iosPod name="AnyThinkiOS/AnyThinkTTAdapter" version="6.2.51" />
<iosPod name="AnyThinkiOS/AnyThinkTTAdapter" version="6.2.68" />
</iosPods>
</dependencies>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><dependencies>
<iosPods>
<iosPod name="AnyThinkiOS/AnyThinkGDTAdapter" version="6.2.51" />
<iosPod name="AnyThinkiOS/AnyThinkGDTAdapter" version="6.2.68" />
</iosPods>
</dependencies>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?><dependencies>
<iosPods>
<iosPod name="AnyThinkiOS/AnyThinkKuaiShouAdapter" version="6.2.51" />
<iosPod name="AnyThinkiOS/AnyThinkKuaiShouAdapter" version="6.2.68" />
<iosPod name="SDWebImage" />
</iosPods>
</dependencies>

View File

@@ -17,16 +17,16 @@ MonoBehaviour:
coreNetwork:
Name: Core
DisplayName: Core
DownloadUrl: https://topon-sdk-release.oss-cn-hangzhou.aliyuncs.com/Unity/6.2.51-plugin/China/AnyThinkCore.unitypackage
DownloadUrl: https://topon-sdk-release.oss-cn-hangzhou.aliyuncs.com/Unity/6.2.72-plugin/China/AnyThinkCore.unitypackage
DependenciesFilePath:
PluginFileName: AnyThinkCore.unitypackage
PluginFilePaths: []
LatestVersions:
Unity: 2.0.1
Android: 6.2.51
Ios: 6.2.51
Android: 6.2.72
Ios: 6.2.68
CurrentVersions:
Unity: 2.0.1
Android: 6.2.51
Ios: 6.2.51
enableAndroidX: 0
Android: 6.2.72
Ios: 6.2.68
enableAndroidX: 1

View File

@@ -25,6 +25,5 @@
android:resource="@xml/alex_tt_file_path" />
</provider>
</application>
</manifest>

View File

@@ -3,18 +3,18 @@
<paths>
<cache-path
name="tt_internal_cache_download"
path="Download" />
name="tt_internal_cache_download"
path="Download" />
<external-files-path
name="tt_external_files_download"
path="Download" />
name="tt_external_files_download"
path="Download" />
<external-path
name="tt_external_root"
path="." />
name="tt_external_root"
path="." />
<external-path
name="tt_external_download"
path="Download" />
name="tt_external_download"
path="Download" />
<files-path
name="tt_internal_file_download"
path="Download" />
name="tt_internal_file_download"
path="Download" />
</paths>

View File

@@ -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

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ffa17b4d22a08804794a574856906799
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -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);
}
/// <summary>
/// 增加微信开放平台的适配
/// </summary>
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

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: f093a7f66c4f4560a3d06bcf236bc89a
timeCreated: 1697048746

View File

@@ -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
}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4ea29d77d0952884eac16339c279a985
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,5 @@
<dependencies>
<androidPackages>
<androidPackage spec="com.tencent.mm.opensdk:wechat-sdk-android:6.8.0"/>
</androidPackages>
</dependencies>

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: ee2de7a1fe734e3599d92016611fc247
timeCreated: 1697050926

View File

@@ -2,7 +2,7 @@
"name": "com.commercialization.topon",
"displayName": "Commercialization.topon",
"description": "基于topon的广告sdk封装依赖基础商业化模块",
"version": "1.0.10",
"version": "1.0.15",
"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"