diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 35409d0..8afee07 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.key.board.journey.inputmethod" minSdk = 24 targetSdk = 35 - versionCode = 2 - versionName = "1.1" + versionCode = 3 + versionName = "1.2" setProperty( "archivesBaseName", "Keyboard Journey_V" + versionName + "(${versionCode})_$timestamp" @@ -74,67 +74,91 @@ dependencies { implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") 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(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") - //-----------------------------------------------TopOn(pangle、IronSource、mintegral、unityads、liftoff(vungle)、Bigo) - //Anythink (Necessary) -// implementation("com.anythink.sdk:core-tpn:6.3.68") -// implementation("com.anythink.sdk:nativead-tpn:6.3.68") -// implementation("com.anythink.sdk:banner-tpn:6.3.68") -// implementation("com.anythink.sdk:interstitial-tpn:6.3.68") -// implementation("com.anythink.sdk:rewardedvideo-tpn:6.3.68") -// implementation("com.anythink.sdk:splash-tpn:6.3.68") -// -// //Androidx (Necessary) -// implementation("androidx.appcompat:appcompat:1.1.0") -// implementation("androidx.browser:browser:1.4.0") -// -// //Vungle -// implementation("com.anythink.sdk:adapter-tpn-vungle:6.3.68") -// implementation("com.vungle:vungle-ads:7.3.2") -// 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.anythink.sdk:adapter-tpn-unityads:6.3.68") -// implementation("com.unity3d.ads:unity-ads:4.9.3") -// -// //Ironsource -// implementation("com.anythink.sdk:adapter-tpn-ironsource:6.3.68") -// implementation("com.ironsource.sdk:mediationsdk:8.1.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.anythink.sdk:adapter-tpn-bigo:6.3.68") -// implementation("com.bigossp:bigo-ads:4.7.4") -// -// //Pangle -// implementation("com.anythink.sdk:adapter-tpn-pangle-nonchina:6.3.68.1") -// implementation( "com.pangle.global:ads-sdk:6.0.0.3") -// implementation( "com.google.android.gms:play-services-ads-identifier:18.0.1") -// -// //Mintegral -// implementation("com.anythink.sdk:adapter-tpn-mintegral-nonchina:6.3.68") -// implementation("com.mbridge.msdk.oversea:reward:16.7.51") -// implementation("com.mbridge.msdk.oversea:newinterstitial:16.7.51") -// implementation("com.mbridge.msdk.oversea:mbnative:16.7.51") -// implementation("com.mbridge.msdk.oversea:mbnativeadvanced:16.7.51") -// implementation("com.mbridge.msdk.oversea:mbsplash:16.7.51") -// implementation("com.mbridge.msdk.oversea:mbbanner:16.7.51") -// implementation("com.mbridge.msdk.oversea:mbbid:16.7.51") -// implementation("androidx.recyclerview:recyclerview:1.1.0") -// -// //Tramini -// implementation("com.anythink.sdk:tramini-plugin-tpn:6.3.68") -// -// // Debugger UI Tools -// implementation ("com.anythink.sdk:debugger-ui:1.0.7") + 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 diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..7960e48 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,29 @@ +{ + "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": [] + } + } + } + ], + "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 95cb5a7..0d0def1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,7 @@ android:label="@string/y_app_name" android:roundIcon="@mipmap/icon" android:supportsRtl="true" + android:networkSecurityConfig="@xml/net" android:theme="@style/MyKeyBoard" tools:targetApi="31"> target, @NonNull DataSource dataSource, boolean isFirstResource) { vb.relayout.setBackground(resource); -// new Thread(new Runnable() { -// @Override -// public void run() { -// String s = getCacheDir() + "/test.jpg"; -// File file = new File(s); -// try { -// DownloadSkinManager.saveDrawableToFile(resource,file); -// } catch (IOException e) { -// -// } -// } -// }).start(); + return false; } }) diff --git a/app/src/main/java/com/key/board/journey/inputmethod/activity/WelActivity.kt b/app/src/main/java/com/key/board/journey/inputmethod/activity/WelActivity.kt index 7044362..897f67d 100644 --- a/app/src/main/java/com/key/board/journey/inputmethod/activity/WelActivity.kt +++ b/app/src/main/java/com/key/board/journey/inputmethod/activity/WelActivity.kt @@ -5,6 +5,9 @@ import android.os.Bundle import android.os.CountDownTimer import android.widget.ProgressBar import androidx.appcompat.app.AppCompatActivity +import com.ad.toponlibrary.AdManager +import com.ad.toponlibrary.AdManager.mContext +import com.anythink.debug.api.ATDebuggerUITest import com.key.board.journey.inputmethod.R import com.key.board.journey.inputmethod.tools.Common import kotlin.math.roundToInt @@ -12,7 +15,7 @@ import kotlin.math.roundToInt class WelActivity : AppCompatActivity() { private lateinit var progressBar: ProgressBar - private var countTime = 1000L + private var countTime = 11000L private lateinit var timer: CountDownTimer override fun onCreate(savedInstanceState: Bundle?) { @@ -21,22 +24,18 @@ class WelActivity : AppCompatActivity() { Common.initFullScreen(this,true) init() findView() + } 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 - } - - override fun onFinish() { - progressBar.progress = 100 - toHome() - } - + timer = AdManager.showWelcomeAd(this@WelActivity,countTime,{ millisUntilFinished-> + val percentage: Float = 100 - millisUntilFinished.toFloat() / countTime * 100 + val round = percentage.roundToInt() + progressBar.progress = round + }){ + progressBar.progress = 100 + toHome() } timer.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 6c1acef..6a7af61 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +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 -// 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 kotlin("kapt") version "2.0.0" } diff --git a/gradle.properties b/gradle.properties index 3c5031e..debf753 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4296691..95ff263 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Jul 04 15:01:52 CST 2025 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 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 61721eb..d7f6fe7 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") } }