diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5d03b84..6ac4b81 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,7 @@ +import java.io.FileInputStream import java.util.Date import java.text.SimpleDateFormat +import java.util.Properties plugins { id("com.android.application") @@ -11,6 +13,11 @@ plugins { } // 生成时间戳（保持原有格式，但后续文件名中不包含特殊字符） val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) +val keystorePropertiesFile = rootProject.file("keystore.properties") +val keystoreProperties = Properties() +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(FileInputStream(keystorePropertiesFile)) +} android { namespace = "com.snap.wall" @@ -20,8 +27,8 @@ android { applicationId = "com.snap.wall" minSdk = 24 targetSdk = 36 - versionCode = 2 - versionName = "1.1" + versionCode = 3 + versionName = "1.2" setProperty("archivesBaseName", "SnapWall_V" + versionName + "(${versionCode})_$timestamp") @@ -29,10 +36,12 @@ android { } signingConfigs { create("release") { - storeFile = file("../app/sapwall.jks") - storePassword = "snapwall" - keyAlias = "wallkey0" - keyPassword = "snapwall" + if (keystorePropertiesFile.exists()) { + keyAlias = keystoreProperties["key_alias"] as String + keyPassword = keystoreProperties["key_password"] as String + storeFile = file(keystoreProperties["keystoreFile"] as String) + storePassword = keystoreProperties["key_store_password"] as String + } } } buildTypes { @@ -74,9 +83,8 @@ dependencies { implementation("jp.wasabeef:glide-transformations:4.3.0") // Glide图片变换库 implementation("com.squareup.okhttp3:okhttp:5.3.1") - implementation(files("libs/TradPlusLibrary_11_25_15_02-release.aar")) - implementation(files("libs/UpLoadLibrary_12_03_15_13-release.aar")) - implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") + + implementation(platform("com.google.firebase:firebase-bom:34.6.0")) @@ -84,75 +92,39 @@ dependencies { implementation("com.google.firebase:firebase-analytics") implementation("com.google.firebase:firebase-config") + implementation(files("libs/IronSourceLibrary_01_07_18_13-release.aar")) + + //---------------------------ironSource + implementation("com.unity3d.ads-mediation:mediation-sdk:9.2.0") +// Add BIGO Ads Network + implementation("com.unity3d.ads-mediation:bigo-adapter:5.2.0") + implementation("com.bigossp:bigo-ads:5.6.2") +// Add Chartboost Network + implementation("com.unity3d.ads-mediation:chartboost-adapter:5.2.0") +// implementation("com.chartboost:chartboost-sdk:9.10.2") - // TradPlus - implementation("com.tradplusad:tradplus:14.5.0.1") - //noinspection GradleCompatible - implementation("androidx.legacy:legacy-support-v4:1.0.0") - implementation("androidx.appcompat:appcompat:1.3.0-alpha02") - // Meta - implementation("com.facebook.android:audience-network-sdk:6.20.0") - implementation("com.tradplusad:tradplus-facebook:1.14.5.0.1") - // Applovin - implementation("com.applovin:applovin-sdk:13.3.1") - implementation("com.tradplusad:tradplus-applovin:9.14.5.0.1") - implementation("com.google.android.gms:play-services-ads-identifier:18.2.0") - // Ironsource - implementation("com.ironsource.sdk:mediationsdk:8.10.0") - implementation("com.tradplusad:tradplus-ironsource:10.14.5.0.1") - implementation("com.google.android.gms:play-services-appset:16.0.0") - implementation("com.google.android.gms:play-services-ads-identifier:17.0.0") - implementation("com.google.android.gms:play-services-basement:17.5.0") - // Adcolony - implementation("com.adcolony:sdk:4.8.0") - implementation("com.tradplusad:tradplus-adcolony:4.14.5.0.1") - implementation("com.google.android.gms:play-services-ads-identifier:17.0.0") - // Pangle - implementation("com.tradplusad:tradplus-pangle:19.14.5.0.1") - implementation("com.pangle.global:pag-sdk:7.3.0.3") - // UnityAds - implementation("com.tradplusad:tradplus-unity:5.14.5.0.1") - implementation("com.unity3d.ads:unity-ads:4.15.1") - // Chartboost - implementation("com.tradplusad:tradplus-chartboostx:15.14.5.0.1") implementation("com.chartboost:chartboost-sdk:9.8.3") - implementation("com.google.android.gms:play-services-ads-identifier:17.0.0") - implementation("com.google.android.gms:play-services-base:17.4.0") - // Inmobi - implementation("com.tradplusad:tradplus-inmobix:23.14.5.0.1") - implementation("com.inmobi.monetization:inmobi-ads-kotlin:10.8.3") - implementation("androidx.core:core-ktx:1.5.0") - implementation("com.inmobi.omsdk:inmobi-omsdk:1.5.2.0") - // Fyber - implementation("com.fyber:marketplace-sdk:8.3.7") - implementation("com.tradplusad:tradplus-fyber:24.14.5.0.1") - implementation("com.google.android.gms:play-services-ads-identifier:17.0.0") - implementation("com.google.android.gms:play-services-base:17.4.0") - // Start.io - implementation("com.startapp:inapp-sdk:5.2.3") - implementation("com.tradplusad:tradplus-startapp:28.14.5.0.1") - // Mintegral - implementation("com.tradplusad:tradplus-mintegralx_overseas:18.14.5.0.1") - implementation("androidx.recyclerview:recyclerview:1.1.0") - implementation("com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.71") - // Liftoff - implementation("com.tradplusad:tradplus-vunglex:7.14.5.0.1") - implementation("com.vungle:vungle-ads:7.5.0") - // Yandex - implementation("com.yandex.android:mobileads:7.13.0") { - exclude(group = "com.caverock", module = "androidsvg-aar") - } - implementation("com.tradplusad:tradplus-yandex:50.14.6.10.1") - // Bigo - implementation("com.bigossp:bigo-ads:5.4.0") - implementation("com.tradplusad:tradplus-bigo:57.14.5.0.1") - // Cross Promotion - implementation("com.tradplusad:tradplus-crosspromotion:27.14.5.0.1") - // TP Exchange - // 请注意保持与主包版本同步更新 - implementation("com.google.code.gson:gson:2.8.6") - implementation("com.tradplusad:tp_exchange:40.14.5.0.1") +// Add DT Exchange Network + implementation("com.unity3d.ads-mediation:fyber-adapter:5.2.0") + implementation("com.fyber:marketplace-sdk:8.4.1") +// Add InMobi Network + implementation("com.unity3d.ads-mediation:inmobi-adapter:5.3.0") + implementation("com.inmobi.monetization:inmobi-ads-kotlin:11.1.0") +// Add Liftoff Monetize Network + implementation("com.unity3d.ads-mediation:vungle-adapter:5.2.0") + implementation("com.vungle:vungle-ads:7.6.1") +// Add Mintegral Network + implementation("com.unity3d.ads-mediation:mintegral-adapter:5.3.0") + implementation("com.mbridge.msdk.oversea:mbridge_android_sdk:17.0.31") +// Add Moloco Network + implementation("com.unity3d.ads-mediation:moloco-adapter:5.5.0") + implementation("com.moloco.sdk:moloco-sdk:4.3.1") +// Add Pangle Network + implementation("com.unity3d.ads-mediation:pangle-adapter:5.4.0") + implementation("com.pangle.global:pag-sdk:7.8.0.7") +// Add Unity Ads Network + implementation("com.unity3d.ads-mediation:unityads-adapter:5.3.0") + implementation("com.unity3d.ads:unity-ads:4.16.4") + - // Google UMP - implementation ("com.google.android.ump:user-messaging-platform:3.2.0") } \ No newline at end of file diff --git a/app/libs/IronSourceLibrary_01_07_18_13-release.aar b/app/libs/IronSourceLibrary_01_07_18_13-release.aar new file mode 100644 index 0000000..97be64b Binary files /dev/null and b/app/libs/IronSourceLibrary_01_07_18_13-release.aar differ diff --git a/app/libs/TradPlusLibrary_11_25_15_02-release.aar b/app/libs/TradPlusLibrary_11_25_15_02-release.aar deleted file mode 100644 index 803bb1c..0000000 Binary files a/app/libs/TradPlusLibrary_11_25_15_02-release.aar and /dev/null differ diff --git a/app/libs/UpLoadLibrary_12_03_15_13-release.aar b/app/libs/UpLoadLibrary_12_03_15_13-release.aar deleted file mode 100644 index a3e30aa..0000000 Binary files a/app/libs/UpLoadLibrary_12_03_15_13-release.aar and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e8699d6..57bdd7d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,8 +17,6 @@ () { + ISAdManager.INSTANCE.init(TAG, this, "250abd6f5", "fp4x08jvg8smowic", "p6njwujvpii2h6j7", "k81ma2caiw0yl4r0", false, new Function1() { @Override - public Unit invoke(String s, String s2) { + public Unit invoke(LevelPlayConfiguration levelPlayConfiguration) { + Log.d(TAG, "onCreate: sdk init success"); return null; } - }); + }, new Function1() { + @Override + public Unit invoke(LevelPlayInitError levelPlayInitError) { + return null; + } + }) ; ObectManager.init(this); executor = Executors.newFixedThreadPool(8); diff --git a/app/src/main/java/com/snap/wall/activity/MySearchActivity.kt b/app/src/main/java/com/snap/wall/activity/MySearchActivity.kt index a8803a2..6f491b9 100644 --- a/app/src/main/java/com/snap/wall/activity/MySearchActivity.kt +++ b/app/src/main/java/com/snap/wall/activity/MySearchActivity.kt @@ -9,7 +9,8 @@ import android.widget.TextView.OnEditorActionListener import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.GridLayoutManager -import com.ad.tradpluslibrary.TPAdManager +import com.ad.ironsourcelibrary.ActionListener +import com.ad.ironsourcelibrary.ISAdManager import com.snap.wall.R import com.snap.wall.adapter.OnItemclick import com.snap.wall.bean.Information @@ -29,10 +30,19 @@ class MySearchActivity : AppCompatActivity() , setContentView(binding.root) Comutils.initFull(this, false) initList() + ISAdManager.loadAllAd() binding.imageviewBack.setOnClickListener { - TPAdManager.showTPAD(this@MySearchActivity) { finish() } + ISAdManager.showIsAd(this@MySearchActivity,object : ActionListener{ + override fun onAction() { + finish() + } + + }) } - TPAdManager.showTPAD(this@MySearchActivity){} + ISAdManager.showIsAd(this@MySearchActivity,object : ActionListener{ + override fun onAction() { + } + }) } diff --git a/app/src/main/java/com/snap/wall/activity/OneActivity.java b/app/src/main/java/com/snap/wall/activity/OneActivity.java index 24cbd6a..ec78f0c 100644 --- a/app/src/main/java/com/snap/wall/activity/OneActivity.java +++ b/app/src/main/java/com/snap/wall/activity/OneActivity.java @@ -2,23 +2,22 @@ package com.snap.wall.activity; import android.content.Intent; import android.os.Bundle; +import android.os.CountDownTimer; import android.widget.ProgressBar; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; -import com.ad.tradpluslibrary.TPAdManager; -import com.snap.wall.App; +import com.ad.ironsourcelibrary.ISAdManager; import com.snap.wall.R; import com.snap.wall.mytool.Comutils; -import android.os.CountDownTimer; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; public class OneActivity extends AppCompatActivity { - private static final long TOTAL_TIME = 12000; + private static final long TOTAL_TIME = 13000; // 进度更新间隔（50毫秒） private static final long UPDATE_INTERVAL = 50; @@ -37,21 +36,8 @@ public class OneActivity extends AppCompatActivity { startCountDown(); } private void startCountDown() { - TPAdManager.INSTANCE.init( - this, - App.TAG, - "909D20753E5D8EB9FEC5DD675DF72811", - "DDFEBCA71E78A60F5F089D3A5FBC0912", - "1A841D5996F8106028429E8799174612", - "BDEA3F104E55C2518696BD77AA80C112", - new Function0() { - @Override - public Unit invoke() { - return null; - } - } - ) ; - countDownTimer = TPAdManager.INSTANCE.showWelcomeAd(this, TOTAL_TIME, new Function1() { + + countDownTimer = ISAdManager.showWelcomeAd(this, TOTAL_TIME, new Function1() { @Override public Unit invoke(Long aLong) { long elapsedTime = TOTAL_TIME - aLong; diff --git a/app/src/main/java/com/snap/wall/activity/PreviewActivity.java b/app/src/main/java/com/snap/wall/activity/PreviewActivity.java index 4bd66e9..2a5ff20 100644 --- a/app/src/main/java/com/snap/wall/activity/PreviewActivity.java +++ b/app/src/main/java/com/snap/wall/activity/PreviewActivity.java @@ -15,7 +15,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.ad.tradpluslibrary.TPAdManager; +import com.ad.ironsourcelibrary.ActionListener; +import com.ad.ironsourcelibrary.ISAdManager; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.DecodeFormat; @@ -24,15 +25,15 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; +import com.snap.wall.R; import com.snap.wall.Wallpaper; import com.snap.wall.adapter.OnSelecttype; -import com.snap.wall.databinding.ActivityPreviewBinding; import com.snap.wall.bean.Information; +import com.snap.wall.databinding.ActivityPreviewBinding; import com.snap.wall.fragment.Mydialog; import com.snap.wall.mytool.Comutils; -import com.snap.wall.mytool.ObectManager; -import com.snap.wall.R; import com.snap.wall.mytool.JsonData; +import com.snap.wall.mytool.ObectManager; import java.io.File; import java.io.FileInputStream; @@ -43,8 +44,6 @@ import java.util.Locale; import java.util.Timer; import java.util.TimerTask; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; import okhttp3.Call; public class PreviewActivity extends AppCompatActivity implements OnSelecttype { @@ -78,10 +77,11 @@ public class PreviewActivity extends AppCompatActivity implements OnSelecttype { finish(); return; } - TPAdManager.INSTANCE.showTPAD(PreviewActivity.this, new Function0() { + ISAdManager.loadAllAd(); + ISAdManager.showIsAd(PreviewActivity.this, new ActionListener() { @Override - public Unit invoke() { - return null; + public void onAction() { + } }); imId = data.getImId(); @@ -197,11 +197,9 @@ public class PreviewActivity extends AppCompatActivity implements OnSelecttype { vb.imageviewBack.setOnClickListener(v -> finish()); vb.buttonSet.setOnClickListener(v -> { - - - TPAdManager.INSTANCE.showTPAD(PreviewActivity.this, new Function0() { + ISAdManager.showIsAd(PreviewActivity.this, new ActionListener() { @Override - public Unit invoke() { + public void onAction() { if (dialogType == null) { dialogType = new Mydialog(); dialogType.setListener(PreviewActivity.this); @@ -209,11 +207,9 @@ public class PreviewActivity extends AppCompatActivity implements OnSelecttype { if (!dialogType.isAdded()) { dialogType.show(getSupportFragmentManager(), ""); } - return null; } }); - }); vb.imageFavorite.setOnClickListener(v -> { @@ -224,16 +220,15 @@ public class PreviewActivity extends AppCompatActivity implements OnSelecttype { }); vb.layoutDownload.setOnClickListener(v -> { - TPAdManager.INSTANCE.showTPAD(PreviewActivity.this, new Function0() { + + ISAdManager.showIsAd(PreviewActivity.this, new ActionListener() { @Override - public Unit invoke() { + public void onAction() { if (JsonData.INSTANCE.requestPermission(PreviewActivity.this, permissionCode)) { startSaveToAlbum(); } - return null; } }); - }); } diff --git a/app/src/main/java/com/snap/wall/activity/PrimaryActivity.java b/app/src/main/java/com/snap/wall/activity/PrimaryActivity.java index b8be58d..d82796a 100644 --- a/app/src/main/java/com/snap/wall/activity/PrimaryActivity.java +++ b/app/src/main/java/com/snap/wall/activity/PrimaryActivity.java @@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment; import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; +import com.ad.ironsourcelibrary.ISAdManager; import com.snap.wall.R; import com.snap.wall.databinding.ActivityPrimaryBinding; import com.snap.wall.fragment.FragmentPrefer; @@ -42,7 +43,6 @@ public class PrimaryActivity extends AppCompatActivity implements View.OnClickLi Comutils.initFull(this, false); vb = ActivityPrimaryBinding.inflate(getLayoutInflater()); setContentView(vb.getRoot()); - initFragments(); initTabViews(); initViewPager2(); diff --git a/app/src/main/java/com/snap/wall/activity/TabActivity.java b/app/src/main/java/com/snap/wall/activity/TabActivity.java index dd64c81..a4766dc 100644 --- a/app/src/main/java/com/snap/wall/activity/TabActivity.java +++ b/app/src/main/java/com/snap/wall/activity/TabActivity.java @@ -7,10 +7,11 @@ import android.view.View; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.GridLayoutManager; -import com.ad.tradpluslibrary.TPAdManager; +import com.ad.ironsourcelibrary.ActionListener; +import com.ad.ironsourcelibrary.ISAdManager; import com.snap.wall.adapter.OnItemclick; -import com.snap.wall.databinding.ActivityTabBinding; import com.snap.wall.bean.Information; +import com.snap.wall.databinding.ActivityTabBinding; import com.snap.wall.myitem.ItemTab; import com.snap.wall.mytool.Comutils; import com.snap.wall.mytool.Itemhelper; @@ -18,9 +19,6 @@ import com.snap.wall.mytool.ObectManager; import java.util.List; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; - public class TabActivity extends AppCompatActivity implements OnItemclick { private ActivityTabBinding vb; @@ -42,10 +40,11 @@ public class TabActivity extends AppCompatActivity implements OnItemclick { finish(); } }); - TPAdManager.INSTANCE.showTPAD(TabActivity.this, new Function0() { + ISAdManager.loadAllAd(); + ISAdManager.showIsAd(TabActivity.this, new ActionListener() { @Override - public Unit invoke() { - return null; + public void onAction() { + } }); } diff --git a/keystore.properties b/keystore.properties index 9d61488..aacb056 100644 --- a/keystore.properties +++ b/keystore.properties @@ -1,6 +1,6 @@ app_name=SnapWall package_name=com.snap.wall -keystoreFile=app/sapwall.jks +keystoreFile=sapwall.jks key_alias=wallkey0 key_store_password=snapwall key_password=snapwall \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 17131b7..a14139d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,26 +11,26 @@ dependencyResolutionManagement { google() mavenCentral() - //------------------------- TradPlus - // Ironsource - maven { url = uri("https://android-sdk.is.com/") } - // Pangle + //------------------------- IronSource + maven { + url = uri("https://android-sdk.is.com/") + } + maven { + url = uri("https://dl.bintray.com/ironsource-mobile/android-sdk") + } + maven { + url = uri("https://dl.bintray.com/ironsource-mobile/android-adapters") + } + maven { + url = uri("https://cboost.jfrog.io/artifactory/chartboost-ads/") + } + maven { + url = uri("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") + } maven { url = uri("https://artifact.bytedance.com/repository/pangle") } - // Chartboost - maven { url = uri("https://cboost.jfrog.io/artifactory/chartboost-ads/") } - maven { - name = "Chartboost Mediation’s maven repo" - url = uri("https://cboost.jfrog.io/artifactory/chartboost-mediation") - } - // Mintegral - //Launch GP market application， Android X Version - //If you fail to pull the code using gradle, add the maven warehouse configuration to the project root build.gradle file - maven { - url = - uri("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") - } + } }