diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 98f1465..ddf8b5a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,8 +4,8 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") id("io.objectbox") -// id("com.google.gms.google-services") -// id("com.google.firebase.crashlytics") + id("com.google.gms.google-services") + id("com.google.firebase.crashlytics") } val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { @@ -17,8 +17,8 @@ android { applicationId = "com.video.livewallpapers" minSdk = 24 targetSdk = 35 - versionCode = 2 - versionName = "1.1" + versionCode = 3 + versionName = "1.2" setProperty( "archivesBaseName", "Live Wallpapers_V" + versionName + "(${versionCode})_$timestamp" @@ -75,5 +75,90 @@ dependencies { implementation ("androidx.media3:media3-ui:1.4.1") implementation ("androidx.media3:media3-exoplayer-dash:1.4.1") + implementation(platform("com.google.firebase:firebase-bom:33.7.0")) + implementation("com.google.firebase:firebase-crashlytics") + implementation("com.google.firebase:firebase-analytics") + implementation("com.google.firebase:firebase-config") + + implementation(files("libs/TopOnLibrary_06_27_16_00-release.aar")) + implementation(files("libs/UpLoadLibrary_07_03_11_54-release.aar")) + + //-----------------------------------------------TopOn(Mintegral、Pangle、UnitAds、Digital Turbine(Fyber)、Chartboost&Helium、Ironsource、Liftoff(Vungle)、Inmobi、Start.io、Bigo) + //TU (Necessary) + implementation("com.thinkup.sdk:core-tpn:6.4.90") + implementation("com.thinkup.sdk:nativead-tpn:6.4.90") + implementation("com.thinkup.sdk:banner-tpn:6.4.90") + implementation("com.thinkup.sdk:interstitial-tpn:6.4.90") + implementation("com.thinkup.sdk:rewardedvideo-tpn:6.4.90") + implementation("com.thinkup.sdk:splash-tpn:6.4.90") + + //Androidx (Necessary) + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("androidx.browser:browser:1.4.0") + + //StartApp + implementation("com.thinkup.sdk:adapter-tpn-startapp:6.4.90") + implementation("com.startapp:inapp-sdk:5.0.2") + + //Vungle + implementation("com.thinkup.sdk:adapter-tpn-vungle:6.4.90") + implementation("com.vungle:vungle-ads:7.5.0") + implementation("com.google.android.gms:play-services-basement:18.1.0") + implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") + + //UnityAds + implementation("com.thinkup.sdk:adapter-tpn-unityads:6.4.90") + implementation("com.unity3d.ads:unity-ads:4.14.0") + + //Ironsource + implementation("com.thinkup.sdk:adapter-tpn-ironsource:6.4.90") + implementation("com.ironsource.sdk:mediationsdk:8.7.0") + 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.thinkup.sdk:adapter-tpn-bigo:6.4.90") + implementation("com.bigossp:bigo-ads:5.3.0") + + //Pangle + implementation("com.thinkup.sdk:adapter-tpn-pangle:6.4.90.1") + implementation("com.pangle.global:pag-sdk:7.2.0.6") + implementation("com.google.android.gms:play-services-ads-identifier:18.2.0") + + //Inmobi + implementation("com.thinkup.sdk:adapter-tpn-inmobi:6.4.90") + implementation("com.inmobi.monetization:inmobi-ads-kotlin:10.8.2") + + //Mintegral + implementation("com.thinkup.sdk:adapter-tpn-mintegral:6.4.90") + implementation("com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.71") + implementation("androidx.recyclerview:recyclerview:1.1.0") + + //Chartboost + implementation("com.thinkup.sdk:adapter-tpn-chartboost:6.4.90") + implementation("com.chartboost:chartboost-sdk:9.8.3") + implementation("com.chartboost:chartboost-mediation-sdk:4.9.2") + implementation("com.chartboost:chartboost-mediation-adapter-chartboost:4.9.8.1.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.thinkup.sdk:adapter-tpn-fyber:6.4.90") + implementation("com.fyber:marketplace-sdk:8.3.7") + implementation("com.google.android.gms:play-services-ads-identifier:18.0.1") + + //Tramini + implementation("com.thinkup.sdk:tramini-plugin-tpn:6.4.90") + + // Debugger UI Tools + implementation("com.anythink.sdk:debugger-ui:1.1.0") + + //----------------------------------------------TopOn } \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..0803df8 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,48 @@ +{ + "project_info": { + "project_number": "901433983115", + "project_id": "keyboard-journey-98af6", + "storage_bucket": "keyboard-journey-98af6.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:901433983115:android:7ce2fd0c5bbba8cb0f148e", + "android_client_info": { + "package_name": "com.key.board.journey.inputmethod" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyBqsuaO9ii0vg1g4qah9n8QUt4uI67PE8E" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:901433983115:android:39725ea56475b5ee0f148e", + "android_client_info": { + "package_name": "com.video.livewallpapers" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyBqsuaO9ii0vg1g4qah9n8QUt4uI67PE8E" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/libs/TopOnLibrary_06_27_16_00-release.aar b/app/libs/TopOnLibrary_06_27_16_00-release.aar new file mode 100644 index 0000000..2500938 Binary files /dev/null and b/app/libs/TopOnLibrary_06_27_16_00-release.aar differ diff --git a/app/libs/UpLoadLibrary_07_03_11_54-release.aar b/app/libs/UpLoadLibrary_07_03_11_54-release.aar new file mode 100644 index 0000000..5a50672 Binary files /dev/null and b/app/libs/UpLoadLibrary_07_03_11_54-release.aar differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 29ca984..5658c6d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,6 +17,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/logo" android:supportsRtl="true" + android:networkSecurityConfig="@xml/net" android:theme="@style/Theme.MyLiveWallpaper" tools:targetApi="31"> () { override fun onClick(v: View?) { v?.let { - if(v == vb.ivBack){ - finish() + if (v == vb.ivBack) { + + AdManager.showTopOn(this@ActivityCollection) { + finish() + } + } } } - override fun getViewBinding(): ActivityCollectionBinding = ActivityCollectionBinding.inflate(layoutInflater) + override fun getViewBinding(): ActivityCollectionBinding = + ActivityCollectionBinding.inflate(layoutInflater) override fun onCreateInit() { - + AdManager.loadAllAd() val adaLike = AdaLike(this) vb.recycler.run { adapter = adaLike @@ -52,7 +59,8 @@ class ActivityCollection : BasisActivity() { vmCollction = getActivityScopeViewModel( - VmCollction::class.java) + VmCollction::class.java + ) vmCollction!!.likeLiveData.observe( this@ActivityCollection @@ -68,6 +76,8 @@ class ActivityCollection : BasisActivity() { vmCollction!!.update(data) } + AdManager.showTopOn(this) {} + } override fun onInitClick() { diff --git a/app/src/main/java/com/hd/live/wall/wallpapers/act/ActivitySetWallpaper.java b/app/src/main/java/com/hd/live/wall/wallpapers/act/ActivitySetWallpaper.java index fc20f44..ffffb16 100644 --- a/app/src/main/java/com/hd/live/wall/wallpapers/act/ActivitySetWallpaper.java +++ b/app/src/main/java/com/hd/live/wall/wallpapers/act/ActivitySetWallpaper.java @@ -17,6 +17,8 @@ import androidx.media3.datasource.DefaultDataSourceFactory; import androidx.media3.exoplayer.ExoPlayer; import androidx.media3.exoplayer.source.ProgressiveMediaSource; +import com.ad.toponlibrary.AdManager; +import com.ad.toponlibrary.onActionListener; import com.hd.live.wall.wallpapers.R; import com.hd.live.wall.wallpapers.base.BasisActivity; import com.hd.live.wall.wallpapers.databinding.ActivitySetWallpapersBinding; @@ -61,10 +63,11 @@ public class ActivitySetWallpaper extends BasisActivity { - private static final long SPLASH_TIME_OUT = 2000L; + private static final long SPLASH_TIME_OUT = 12000L; private CountDownTimer countDownTimer; @Override @@ -19,22 +24,25 @@ public class ActivityWel extends BasisActivity { @Override protected void onCreateInit() { - countDownTimer = new CountDownTimer(SPLASH_TIME_OUT,100) { + + countDownTimer = AdManager.showWelcomeAd(this, SPLASH_TIME_OUT, new Function1() { @Override - public void onTick(long millisUntilFinished) { - float v = 100 - (float) millisUntilFinished / SPLASH_TIME_OUT * 100; + public Unit invoke(Long aLong) { + float v = 100 - (float) aLong / SPLASH_TIME_OUT * 100; int v1 = (int) v; vb.progressBar.setProgress(v1); + return null; } - + }, new Function0() { @Override - public void onFinish() { + public Unit invoke() { vb.progressBar.setProgress(100); Intent intent = new Intent(ActivityWel.this, ActivityMain.class); startActivity(intent); finish(); + return null; } - }; + }); countDownTimer.start(); } diff --git a/app/src/main/res/xml/net.xml b/app/src/main/res/xml/net.xml new file mode 100644 index 0000000..0ac6102 --- /dev/null +++ b/app/src/main/res/xml/net.xml @@ -0,0 +1,6 @@ + + + + mobile-server.lux-ad.com + + diff --git a/build.gradle.kts b/build.gradle.kts index 03d0add..0cfba20 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,8 @@ plugins { id("com.android.application") version "8.6.0" apply false id("org.jetbrains.kotlin.android") version "2.0.0" apply false -// id("com.google.gms.google-services") version "4.4.2" apply false -// id ("com.google.firebase.crashlytics") version "3.0.2" apply false + id("com.google.gms.google-services") version "4.4.2" apply false + id ("com.google.firebase.crashlytics") version "3.0.2" apply false } buildscript { diff --git a/settings.gradle.kts b/settings.gradle.kts index 0ff122c..fb266d0 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,24 @@ dependencyResolutionManagement { google() mavenCentral() + //TU(Core) + maven ( "https://jfrog.anythinktech.com/artifactory/overseas_sdk") + //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") } }