diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 202ac79..12d2e05 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,8 +5,8 @@ import java.text.SimpleDateFormat plugins { id("com.android.application") id("org.jetbrains.kotlin.android") -// id("com.google.gms.google-services") -// id("com.google.firebase.crashlytics") + id("com.google.gms.google-services") + id("com.google.firebase.crashlytics") kotlin("kapt") id ("kotlin-android") } @@ -21,8 +21,8 @@ android { applicationId = "com.keyboard.keyboardtheme.skin" minSdk = 24 targetSdk = 35 - versionCode = 1 - versionName = "1.0" + versionCode = 2 + versionName = "1.1" setProperty( "archivesBaseName", "Keyboard Theme Skin_V" + versionName + "(${versionCode})_$timestamp" @@ -74,5 +74,91 @@ dependencies { implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0") + 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..b051906 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,29 @@ +{ + "project_info": { + "project_number": "64607714788", + "project_id": "keyboard-theme-skin", + "storage_bucket": "keyboard-theme-skin.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:64607714788:android:f9fe319ab12a1783095bf1", + "android_client_info": { + "package_name": "com.keyboard.keyboardtheme.skin" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyCwdU4lvFQcoMJ-OwL4bmqh7dDCDD6fFx0" + } + ], + "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/java/com/keyboard/keyboardtheme/skin/MyApp.kt b/app/src/main/java/com/keyboard/keyboardtheme/skin/MyApp.kt index 99f37b3..bbf40e4 100644 --- a/app/src/main/java/com/keyboard/keyboardtheme/skin/MyApp.kt +++ b/app/src/main/java/com/keyboard/keyboardtheme/skin/MyApp.kt @@ -3,8 +3,10 @@ package com.keyboard.keyboardtheme.skin //import com.pretty.keyboard.theme.keyboard.helper.ObjectBox import android.app.Application import android.graphics.Typeface +import com.ad.toponlibrary.AdManager import com.keyboard.keyboardtheme.skin.datamanager.localdata.Child import com.keyboard.keyboardtheme.skin.datamanager.localdata.ParentData +import com.up.uploadlibrary.UpLoadManager import org.json.JSONArray import java.io.BufferedReader import java.io.IOException @@ -30,7 +32,12 @@ class MyApp : Application() { myAppInstance = this defaultFont = Typeface.createFromAsset(assets, "font5.ttf") dealFile() - + AdManager.init(TAG,this,"h68944103435d2","a41be189d623537d941b78e1f704b79be", + "9788519403e27aa6420a9b9ad49bc0fc76166bea", + "n6894416554630", + "n689441559c5ff", + "n68944149bda5b",false); + UpLoadManager.init(this,TAG); } diff --git a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActDownload.kt b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActDownload.kt index 5fabf36..8241d9d 100644 --- a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActDownload.kt +++ b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActDownload.kt @@ -15,6 +15,9 @@ import androidx.core.view.isVisible import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.ad.toponlibrary.AdManager + +import com.ad.toponlibrary.onActionListener import com.bumptech.glide.Glide import com.bumptech.glide.integration.webp.decoder.WebpDrawable import com.bumptech.glide.load.DataSource @@ -23,15 +26,14 @@ import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.target.Target import com.keyboard.keyboardtheme.skin.MyApp import com.keyboard.keyboardtheme.skin.R - import com.keyboard.keyboardtheme.skin.adapter.AdaList import com.keyboard.keyboardtheme.skin.datamanager.db.DbManager -import com.keyboard.keyboardtheme.skin.utils.OnApply -import com.keyboard.keyboardtheme.skin.utils.OnClick import com.keyboard.keyboardtheme.skin.datamanager.localdata.Child import com.keyboard.keyboardtheme.skin.utils.Common -import com.keyboard.keyboardtheme.skin.utils.StoreCurTheme import com.keyboard.keyboardtheme.skin.utils.MyZipMan +import com.keyboard.keyboardtheme.skin.utils.OnApply +import com.keyboard.keyboardtheme.skin.utils.OnClick +import com.keyboard.keyboardtheme.skin.utils.StoreCurTheme import kotlinx.coroutines.launch import java.io.File @@ -88,13 +90,14 @@ class ActDownload : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.act_download) Common.initFullScreen(this,true) + AdManager.loadAllAd() findViewId() getExtraData() displayData() setApply() onClick() - + AdManager.showTopOn(this, onActionListener { }) } @@ -162,7 +165,9 @@ class ActDownload : AppCompatActivity() { private fun onClick() { imgBack.setOnClickListener { - finish() + AdManager.showTopOn(this@ActDownload){ + finish() + } } imgLike.setOnClickListener { @@ -239,11 +244,9 @@ class ActDownload : AppCompatActivity() { private fun setApply() { applyBtn.setOnClickListener { - - startDown() - - - + AdManager.showTopOn(this@ActDownload){ + startDown() + } } } diff --git a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActMain.java b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActMain.java index b5c72ab..dc7077d 100644 --- a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActMain.java +++ b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActMain.java @@ -14,6 +14,7 @@ import androidx.fragment.app.Fragment; import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; +import com.ad.toponlibrary.AdManager; import com.bumptech.glide.Glide; import com.google.android.material.tabs.TabLayout; import com.keyboard.keyboardtheme.skin.MyApp; @@ -41,6 +42,7 @@ public class ActMain extends AppCompatActivity { vb = ActMainBinding.inflate(getLayoutInflater()); Common.INSTANCE.initFullScreen(this, true); setContentView(vb.getRoot()); + loadBanner(); init(); diff --git a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActOkPreview.java b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActOkPreview.java index 314b921..c8d154f 100644 --- a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActOkPreview.java +++ b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActOkPreview.java @@ -14,6 +14,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import com.ad.toponlibrary.AdManager; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; @@ -41,7 +42,7 @@ public class ActOkPreview extends AppCompatActivity { Common.INSTANCE.initFullScreen(this,true); vb = ActOkPreviewBinding.inflate(getLayoutInflater()); setContentView(vb.getRoot()); - ; + AdManager.loadAllAd(); onInit(); } diff --git a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActSplashWel.kt b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActSplashWel.kt index 1e81e4d..803fef3 100644 --- a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActSplashWel.kt +++ b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActSplashWel.kt @@ -6,6 +6,7 @@ import android.os.CountDownTimer import android.widget.ProgressBar import android.widget.TextView import androidx.appcompat.app.AppCompatActivity +import com.ad.toponlibrary.AdManager import com.keyboard.keyboardtheme.skin.R import com.keyboard.keyboardtheme.skin.utils.Common @@ -29,22 +30,17 @@ class ActSplashWel : AppCompatActivity() { } private fun init() { - timer = object :CountDownTimer(countTime,100){ - - override fun onTick(millisUntilFinished: Long) { - val percentage: Float = 100 - millisUntilFinished.toFloat() / countTime * 100 - val round = percentage.roundToInt() - progressBar.progress = round - val format =getString(R.string.tv_wel_progress, round) - tvProgress.text = format - } - - override fun onFinish() { - progressBar.progress = 100 - tvProgress.text = getString(R.string.tv_wel_progress, 100) - toHome() - } + timer = AdManager.showWelcomeAd(this@ActSplashWel,countTime,{ + val percentage: Float = 100 - it.toFloat() / countTime * 100 + val round = percentage.roundToInt() + progressBar.progress = round + val format =getString(R.string.tv_wel_progress, round) + tvProgress.text = format + }){ + progressBar.progress = 100 + tvProgress.text = getString(R.string.tv_wel_progress, 100) + toHome() } timer.start() diff --git a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActViewAll.java b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActViewAll.java index 89fce6f..fcc54c5 100644 --- a/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActViewAll.java +++ b/app/src/main/java/com/keyboard/keyboardtheme/skin/act/ActViewAll.java @@ -6,6 +6,8 @@ import android.view.View; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.GridLayoutManager; +import com.ad.toponlibrary.AdManager; +import com.ad.toponlibrary.onActionListener; import com.keyboard.keyboardtheme.skin.MyApp; import com.keyboard.keyboardtheme.skin.adapter.AdaList; import com.keyboard.keyboardtheme.skin.databinding.ActViewAllBinding; @@ -28,10 +30,16 @@ public class ActViewAll extends AppCompatActivity { vb = ActViewAllBinding.inflate(getLayoutInflater()); Common.INSTANCE.initFullScreen(this, true); setContentView(vb.getRoot()); - ; + AdManager.loadAllAd(); name = getIntent().getStringExtra(KEY_NAME); initData(); initClick(); + AdManager.showTopOn(this, new onActionListener() { + @Override + public void onAction() { + + } + }); } diff --git a/build.gradle.kts b/build.gradle.kts index e5b4388..a705be8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.6.0" apply false + id("com.android.application") version "8.10.1" apply false id("org.jetbrains.kotlin.android") version "2.0.0" apply false kotlin("kapt") version "2.0.0" + id("com.google.gms.google-services") version "4.4.2" apply false + id ("com.google.firebase.crashlytics") version "3.0.2" apply false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle.kts b/settings.gradle.kts index 4df1589..09af926 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,7 +12,24 @@ dependencyResolutionManagement { google() mavenCentral() maven("https://jitpack.io") + //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") } }