diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c46f1ff..b286412 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,8 +21,8 @@ android { applicationId = "com.keyboard.skinning.cool" minSdk = 23 targetSdk = 34 - versionCode = 2 - versionName = "1.0.1" + versionCode = 3 + versionName = "1.0.2" setProperty( "archivesBaseName", "Keyboard Skinning_V" + versionName + "(${versionCode})_$timestamp" @@ -100,17 +100,17 @@ dependencies { implementation("androidx.appcompat:appcompat:1.1.0") implementation("androidx.browser:browser:1.4.0") - //StartApp - implementation("com.anythink.sdk:adapter-tpn-startapp:6.4.07") - implementation("com.startapp:inapp-sdk:5.0.2") - - //Appnext - implementation("com.anythink.sdk:adapter-tpn-appnext:6.4.07") - implementation("com.appnext.sdk:ads:2.7.1.473") - implementation("com.appnext.sdk:banners:2.7.1.473") - implementation("com.appnext.sdk:native-ads2:2.7.1.473") - implementation("com.appnext.sdk:actions:2.4.6.472") - implementation("androidx.constraintlayout:constraintlayout:2.0.4") +// //StartApp +// implementation("com.anythink.sdk:adapter-tpn-startapp:6.4.07") +// implementation("com.startapp:inapp-sdk:5.0.2") +// +// //Appnext +// implementation("com.anythink.sdk:adapter-tpn-appnext:6.4.07") +// implementation("com.appnext.sdk:ads:2.7.1.473") +// implementation("com.appnext.sdk:banners:2.7.1.473") +// implementation("com.appnext.sdk:native-ads2:2.7.1.473") +// implementation("com.appnext.sdk:actions:2.4.6.472") +// implementation("androidx.constraintlayout:constraintlayout:2.0.4") //Vungle implementation("com.anythink.sdk:adapter-tpn-vungle:6.4.07") @@ -119,60 +119,60 @@ dependencies { implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") //UnityAds - implementation("com.anythink.sdk:adapter-tpn-unityads:6.4.07") - implementation("com.unity3d.ads:unity-ads:4.12.2") - - //Ironsource - implementation("com.anythink.sdk:adapter-tpn-ironsource:6.4.07") - implementation("com.ironsource.sdk:mediationsdk:8.2.1") - implementation("com.google.android.gms:play-services-appset:16.0.2") - implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") - implementation("com.google.android.gms:play-services-basement:18.1.0") - - //Bigo - implementation("com.anythink.sdk:adapter-tpn-bigo:6.4.07") - implementation("com.bigossp:bigo-ads:4.9.0") - - //Pangle - implementation("com.anythink.sdk:adapter-tpn-pangle-nonchina:6.4.07") - implementation("com.pangle.global:ads-sdk:6.1.0.9") - implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") - - //Inmobi - implementation("com.anythink.sdk:adapter-tpn-inmobi:6.4.07") - implementation("com.inmobi.monetization:inmobi-ads-kotlin:10.7.5") - - //Mintegral - implementation("com.anythink.sdk:adapter-tpn-mintegral-nonchina:6.4.07") - implementation("com.mbridge.msdk.oversea:reward:16.8.11") - implementation("com.mbridge.msdk.oversea:newinterstitial:16.8.11") - implementation("com.mbridge.msdk.oversea:mbnative:16.8.11") - implementation("com.mbridge.msdk.oversea:mbnativeadvanced:16.8.11") - implementation("com.mbridge.msdk.oversea:mbsplash:16.8.11") - implementation("com.mbridge.msdk.oversea:mbbanner:16.8.11") - implementation("com.mbridge.msdk.oversea:mbbid:16.8.11") - implementation("androidx.recyclerview:recyclerview:1.1.0") - - //Chartboost - implementation("com.anythink.sdk:adapter-tpn-chartboost:6.4.07") - implementation("com.chartboost:chartboost-sdk:9.7.0") - implementation("com.chartboost:chartboost-mediation-sdk:4.9.1") - implementation("com.chartboost:chartboost-mediation-adapter-chartboost:4.9.7.0.0") - implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0") - implementation("com.squareup.okhttp3:logging-interceptor:4.10.0") - implementation("com.squareup.okhttp3:okhttp:4.10.0") - implementation("com.squareup.retrofit2:converter-scalars:2.9.0") - implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") - - //Fyber - implementation("com.anythink.sdk:adapter-tpn-fyber:6.4.07") - implementation("com.fyber:marketplace-sdk:8.3.0") - implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") +// implementation("com.anythink.sdk:adapter-tpn-unityads:6.4.07") +// implementation("com.unity3d.ads:unity-ads:4.12.2") +// +// //Ironsource +// implementation("com.anythink.sdk:adapter-tpn-ironsource:6.4.07") +// implementation("com.ironsource.sdk:mediationsdk:8.2.1") +// implementation("com.google.android.gms:play-services-appset:16.0.2") +// implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") +// implementation("com.google.android.gms:play-services-basement:18.1.0") +// +// //Bigo +// implementation("com.anythink.sdk:adapter-tpn-bigo:6.4.07") +// implementation("com.bigossp:bigo-ads:4.9.0") +// +// //Pangle +// implementation("com.anythink.sdk:adapter-tpn-pangle-nonchina:6.4.07") +// implementation("com.pangle.global:ads-sdk:6.1.0.9") +// implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") +// +// //Inmobi +// implementation("com.anythink.sdk:adapter-tpn-inmobi:6.4.07") +// implementation("com.inmobi.monetization:inmobi-ads-kotlin:10.7.5") +// +// //Mintegral +// implementation("com.anythink.sdk:adapter-tpn-mintegral-nonchina:6.4.07") +// implementation("com.mbridge.msdk.oversea:reward:16.8.11") +// implementation("com.mbridge.msdk.oversea:newinterstitial:16.8.11") +// implementation("com.mbridge.msdk.oversea:mbnative:16.8.11") +// implementation("com.mbridge.msdk.oversea:mbnativeadvanced:16.8.11") +// implementation("com.mbridge.msdk.oversea:mbsplash:16.8.11") +// implementation("com.mbridge.msdk.oversea:mbbanner:16.8.11") +// implementation("com.mbridge.msdk.oversea:mbbid:16.8.11") +// implementation("androidx.recyclerview:recyclerview:1.1.0") +// +// //Chartboost +// implementation("com.anythink.sdk:adapter-tpn-chartboost:6.4.07") +// implementation("com.chartboost:chartboost-sdk:9.7.0") +// implementation("com.chartboost:chartboost-mediation-sdk:4.9.1") +// implementation("com.chartboost:chartboost-mediation-adapter-chartboost:4.9.7.0.0") +// implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0") +// implementation("com.squareup.okhttp3:logging-interceptor:4.10.0") +// implementation("com.squareup.okhttp3:okhttp:4.10.0") +// implementation("com.squareup.retrofit2:converter-scalars:2.9.0") +// implementation("com.squareup.retrofit2:retrofit:2.9.0") +// implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1") +// implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") +// +// //Fyber +// implementation("com.anythink.sdk:adapter-tpn-fyber:6.4.07") +// implementation("com.fyber:marketplace-sdk:8.3.0") +// implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") // Debugger UI Tools - //implementation ("com.anythink.sdk:debugger-ui:1.0.7") +// implementation ("com.anythink.sdk:debugger-ui:1.0.7") //----------------------------------------------TopOn diff --git a/app/src/main/java/com/keyboard/skinning/cool/App.kt b/app/src/main/java/com/keyboard/skinning/cool/App.kt index 6ae0863..fc028ab 100644 --- a/app/src/main/java/com/keyboard/skinning/cool/App.kt +++ b/app/src/main/java/com/keyboard/skinning/cool/App.kt @@ -1,5 +1,6 @@ package com.keyboard.skinning.cool +//import com.pretty.keyboard.theme.keyboard.helper.ObjectBox import android.app.Application import android.graphics.Typeface import com.anythink.core.api.ATSDK @@ -7,7 +8,6 @@ import com.anythink.core.api.NetTrafficeCallback import com.keyboard.skinning.cool.ad.AdManager import com.keyboard.skinning.cool.data.ChildData import com.keyboard.skinning.cool.data.ClassData -//import com.pretty.keyboard.theme.keyboard.helper.ObjectBox import org.json.JSONArray import java.io.BufferedReader import java.io.IOException @@ -139,9 +139,9 @@ class App : Application() { }) val APPId = "h67db7f232075e" val AppKey = "ad87edbfa080f02492716cd8e4499fa07" - ATSDK.init(this, APPId, AppKey); + ATSDK.init(this, APPId, AppKey) //测试工具 -// ATDebuggerUITest.showDebuggerUI(this,debug_KEy); +// ATDebuggerUITest.showDebuggerUI(this,"8bd923b5b856161effd29abe2f86cc2cedcfd219") AdManager.loadAllAd() } diff --git a/app/src/main/java/com/keyboard/skinning/cool/activity/MainActivity.java b/app/src/main/java/com/keyboard/skinning/cool/activity/MainActivity.java index d1d88ea..51bf484 100644 --- a/app/src/main/java/com/keyboard/skinning/cool/activity/MainActivity.java +++ b/app/src/main/java/com/keyboard/skinning/cool/activity/MainActivity.java @@ -34,7 +34,6 @@ public class MainActivity extends AppCompatActivity { vb = ActivityMainBinding.inflate(getLayoutInflater()); Helper.INSTANCE.initFullScreen(this,false); setContentView(vb.getRoot()); - AdManager.loadAllAd(); init(); } diff --git a/app/src/main/java/com/keyboard/skinning/cool/activity/WelcomeActivity.kt b/app/src/main/java/com/keyboard/skinning/cool/activity/WelcomeActivity.kt index 109ec45..0e80db3 100644 --- a/app/src/main/java/com/keyboard/skinning/cool/activity/WelcomeActivity.kt +++ b/app/src/main/java/com/keyboard/skinning/cool/activity/WelcomeActivity.kt @@ -46,7 +46,7 @@ class WelcomeActivity : AppCompatActivity() { private fun toHome() { - startActivity(Intent(this, com.keyboard.skinning.cool.activity.MainActivity::class.java)) + startActivity(Intent(this,MainActivity::class.java)) finish() } diff --git a/app/src/main/java/com/keyboard/skinning/cool/ad/AdManager.java b/app/src/main/java/com/keyboard/skinning/cool/ad/AdManager.java index b2b5a48..d0fea64 100644 --- a/app/src/main/java/com/keyboard/skinning/cool/ad/AdManager.java +++ b/app/src/main/java/com/keyboard/skinning/cool/ad/AdManager.java @@ -43,6 +43,9 @@ public class AdManager { public static void loadAllAd() { + place1LoadFail = false; + place2LoadFail = false; + place3LoadFail = false; if (list.size() == 0) { ATInterstitial mInterstitialAd1 = new ATInterstitial(App.appInstance, place1Id); ATInterstitial mInterstitialAd2 = new ATInterstitial(App.appInstance, place2Id); @@ -169,6 +172,11 @@ public class AdManager { showAD(activity, new AdStatusAction() { @Override public void onStatus(int adType) { + if(place1LoadFail&&place2LoadFail&&place3LoadFail){ + Log.d(App.TAG,"------------all load fail"); + alreadyShow = true; + goMain.onGo(); + } if (adType == type_has_cache) { alreadyShow = true; } diff --git a/settings.gradle.kts b/settings.gradle.kts index f4f4981..6674a71 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,21 +15,21 @@ dependencyResolutionManagement { //Anythink(Core) maven ("https://jfrog.anythinktech.com/artifactory/overseas_sdk") - //Appnext - maven ("https://dl.appnext.com") - - //Ironsource - maven ("https://android-sdk.is.com/") - - //Pangle - maven ("https://artifact.bytedance.com/repository/pangle") - - //Mintegral - maven ("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") - - //Chartboost - maven ("https://cboost.jfrog.io/artifactory/chartboost-ads") - maven ("https://cboost.jfrog.io/artifactory/chartboost-mediation") +// //Appnext +// maven ("https://dl.appnext.com") +// +// //Ironsource +// maven ("https://android-sdk.is.com/") +// +// //Pangle +// maven ("https://artifact.bytedance.com/repository/pangle") +// +// //Mintegral +// maven ("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") +// +// //Chartboost +// maven ("https://cboost.jfrog.io/artifactory/chartboost-ads") +// maven ("https://cboost.jfrog.io/artifactory/chartboost-mediation") //TopOn集成测试工具 // maven ( "https://jfrog.anythinktech.com/artifactory/debugger")