diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f060ac2..d370631 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,6 +3,8 @@ import java.util.Date plugins { alias(libs.plugins.android.application) + id("com.google.gms.google-services") + id("com.google.firebase.crashlytics") } val timestamp: String = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { @@ -13,8 +15,8 @@ android { applicationId = "com.wallpaper.wallpaperbox" minSdk = 23 targetSdk = 35 - versionCode = 1 - versionName = "1.0.0" + versionCode = 2 + versionName = "1.0.1" setProperty("archivesBaseName", "Wallpaper Box_V" + versionName + "(${versionCode})_$timestamp") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -55,4 +57,103 @@ dependencies { implementation ("androidx.room:room-runtime:2.6.1") annotationProcessor ("androidx.room:room-compiler:2.6.1") + + // Import the BoM for the Firebase platform + implementation(platform("com.google.firebase:firebase-bom:33.1.1")) + + // Add the dependencies for the Crashlytics and Analytics libraries + // When using the BoM, you don't specify versions in Firebase library dependencies + implementation("com.google.firebase:firebase-crashlytics") + implementation("com.google.firebase:firebase-analytics") + implementation("com.google.firebase:firebase-config") + + //-----------------------------------------------TopOn(Mintegral、Pangle、UnitAds、Digital Turbine(Fyber)、Chartboost&Helium、Ironsource、Liftoff(Vungle)、Inmobi、Start.io、Appnext、Bigo) + + //Anythink (Necessary) + implementation("com.anythink.sdk:core-tpn:6.4.07") + implementation("com.anythink.sdk:nativead-tpn:6.4.07") + implementation("com.anythink.sdk:banner-tpn:6.4.07") + implementation("com.anythink.sdk:interstitial-tpn:6.4.07") + implementation("com.anythink.sdk:rewardedvideo-tpn:6.4.07") + implementation("com.anythink.sdk:splash-tpn:6.4.07") + + //Androidx (Necessary) + 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") + + //Vungle + implementation("com.anythink.sdk:adapter-tpn-vungle:6.4.07") + implementation("com.vungle:vungle-ads:7.4.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.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.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..611aa38 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,29 @@ +{ + "project_info": { + "project_number": "135315705997", + "project_id": "wallpaper-box-69742", + "storage_bucket": "wallpaper-box-69742.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:135315705997:android:f774b1ddfe3822e25c52c4", + "android_client_info": { + "package_name": "com.wallpaper.wallpaperbox" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyAYqM-Hl3opMGA9OU8R28NBExgvfK9YNu8" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8e14d78..e01a8f4 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -32,3 +32,132 @@ -keep class com.wallpaper.wallpaperbox.data.database.AppDatabase { *; } -keep class com.wallpaper.wallpaperbox.data.entity.WallpaperEntity { *; } -keep class com.wallpaper.wallpaperbox.data.dao.WallpaperEntityDao { *; } + +#---------------------------------------------Topon + -keep class com.startapp.** { + *; + } + + -keep class com.truenet.** { + *; + } + + -keepattributes Exceptions, InnerClasses, Signature, Deprecated, SourceFile, + LineNumberTable, *Annotation*, EnclosingMethod + -dontwarn android.webkit.JavascriptInterface + -dontwarn com.startapp.** + + -dontwarn org.jetbrains.annotations.** + -keep class com.appnext.** { *; } + -dontwarn com.appnext.** + # Vungle + -dontwarn com.vungle.ads.** + -keepclassmembers class com.vungle.ads.** { + *; + } + -keep class com.vungle.ads.** + + + + # Google + -keep class com.google.android.gms.** { *; } + -dontwarn com.google.android.gms.** + + + + + # START OkHttp + Okio + # JSR 305 annotations are for embedding nullability information. + -dontwarn javax.annotation.** + + + # A resource is loaded with a relative path so the package of this class must be preserved. + -adaptresourcefilenames okhttp3/internal/publicsuffix/PublicSuffixDatabase.gz + + + # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. + -dontwarn org.codehaus.mojo.animal_sniffer.* + + + # OkHttp platform used only on JVM and when Conscrypt and other security providers are available. + -dontwarn okhttp3.internal.platform.** + -dontwarn org.conscrypt.** + -dontwarn org.bouncycastle.** + -dontwarn org.openjsse.** + + + # Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. + -dontwarn org.codehaus.mojo.animal_sniffer.* + + + # END OkHttp + Okio + + + # START Protobuf + -dontwarn com.google.protobuf.** + -keepclassmembers class com.google.protobuf.** { + *; + } + -keep class * extends com.google.protobuf.GeneratedMessageLite { *; } + + + # END Protobuf + -keepclassmembers class com.ironsource.sdk.controller.IronSourceWebView$JSInterface { + public *; + } + -keepclassmembers class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator *; + } + -keep public class com.google.android.gms.ads.** { + public *; + } + -keep class com.ironsource.adapters.** { *; + } + -dontwarn com.ironsource.mediationsdk.** + -dontwarn com.ironsource.adapters.** + -keepattributes JavascriptInterface + -keepclassmembers class * { + @android.webkit.JavascriptInterface ; + } + -keep class com.bytedance.sdk.** { *; } + -keep class com.inmobi.** { *; } + -keep public class com.google.android.gms.** + -dontwarn com.google.android.gms.** + -dontwarn com.squareup.picasso.** + -keep class com.google.android.gms.ads.identifier.AdvertisingIdClient{ + public *; + } + -keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info{ + public *; + } + # skip the Picasso library classes + -keep class com.squareup.picasso.** {*;} + -dontwarn com.squareup.okhttp.** + # skip Moat classes + -keep class com.moat.** {*;} + -dontwarn com.moat.** + # skip IAB classes + -keep class com.iab.** {*;} + -dontwarn com.iab.** + -keepattributes Signature + -keepattributes *Annotation* + -keep class com.mbridge.** {*; } + -keep interface com.mbridge.** {*; } + -keep class android.support.v4.** { *; } + -dontwarn com.mbridge.** + -keep class **.R$* { public static final int mbridge*; } + -keep public class com.mbridge.* extends androidx.** { *; } + -keep public class androidx.viewpager.widget.PagerAdapter{ *; } + -keep public class androidx.viewpager.widget.ViewPager.OnPageChangeListener{ *; } + -keep interface androidx.annotation.IntDef{ *; } + -keep interface androidx.annotation.Nullable{ *; } + -keep interface androidx.annotation.CheckResult{ *; } + -keep interface androidx.annotation.NonNull{ *; } + -keep public class androidx.fragment.app.Fragment{ *; } + -keep public class androidx.core.content.FileProvider{ *; } + -keep public class androidx.core.app.NotificationCompat{ *; } + -keep public class androidx.appcompat.widget.AppCompatImageView { *; } + -keep public class androidx.recyclerview.*{ *; } + -keep class com.chartboost.** { *; } + + #---------------------------------------------Topon \ No newline at end of file diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/MyApplication.java b/app/src/main/java/com/wallpaper/wallpaperbox/MyApplication.java index c5a6e0d..89067b5 100644 --- a/app/src/main/java/com/wallpaper/wallpaperbox/MyApplication.java +++ b/app/src/main/java/com/wallpaper/wallpaperbox/MyApplication.java @@ -3,11 +3,16 @@ package com.wallpaper.wallpaperbox; import android.app.Application; import android.content.Context; import android.content.SharedPreferences; +import android.util.Log; +import com.anythink.core.api.ATSDK; +import com.anythink.core.api.NetTrafficeCallback; +import com.google.firebase.FirebaseApp; import com.wallpaper.wallpaperbox.data.dao.WallpaperEntityDao; import com.wallpaper.wallpaperbox.data.database.AppDatabase; import com.wallpaper.wallpaperbox.data.entity.WallpaperEntity; import com.wallpaper.wallpaperbox.data.repository.WallpaperRepository; +import com.wallpaper.wallpaperbox.topon.AdManager; import com.wallpaper.wallpaperbox.util.JsonUtil; import java.util.List; @@ -20,6 +25,11 @@ public class MyApplication extends Application { private static final String PREF_NAME = "app_preferences"; private static final String KEY_INITIALIZED = "isInit"; + public static final String TAG = "--------------"; + + private static final String AppKey = "a7903e950eb399d148180e8cdf19c8644"; + private static final String APPId = "h67b820108e2ec"; + @Override public void onCreate() { super.onCreate(); @@ -33,6 +43,45 @@ public class MyApplication extends Application { initializeDatabase(); preferences.edit().putBoolean(KEY_INITIALIZED, true).apply(); } + +// // 确保Firebase初始化 +// FirebaseApp.initializeApp(this); +// +// // 输出日志以确认Firebase初始化 +// if (!FirebaseApp.getApps(this).isEmpty()) { +// Log.d("TAG", "Firebase1 初始化成功1"); +// } else { +// Log.e("TAG", "Firebase0 初始化失败0"); +// } + + initSdk(); + } + + private void initSdk() { + + ATSDK.checkIsEuTraffic(this, new NetTrafficeCallback() { + + @Override + public void onResultCallback(boolean isEU) { + Log.e(TAG, "onResultCallback:" + isEU); + if (isEU && ATSDK.getGDPRDataLevel(MyApplication.this) == ATSDK.UNKNOWN) { + ATSDK.showGdprAuth(MyApplication.this); + } + + } + + @Override + public void onErrorCallback(String errorMsg) { + Log.e(TAG, "onErrorCallback:" + errorMsg); + } + }); + + ATSDK.init( this, APPId, AppKey); + AdManager.loadAllAd(); + //测试工具 +// ATDebuggerUITest.showDebuggerUI(this,debug_KEy); +// ATSDK.setNetworkLogDebug(true); + } public static Context getContext() { diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/topon/AdListener.java b/app/src/main/java/com/wallpaper/wallpaperbox/topon/AdListener.java new file mode 100644 index 0000000..aefa8c5 --- /dev/null +++ b/app/src/main/java/com/wallpaper/wallpaperbox/topon/AdListener.java @@ -0,0 +1,10 @@ +package com.wallpaper.wallpaperbox.topon; + +public interface AdListener { + void loadFail(String placeId); + void showSuccess(); + + void showFail(); + + void showClose(); +} diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/topon/AdManager.java b/app/src/main/java/com/wallpaper/wallpaperbox/topon/AdManager.java new file mode 100644 index 0000000..1c75092 --- /dev/null +++ b/app/src/main/java/com/wallpaper/wallpaperbox/topon/AdManager.java @@ -0,0 +1,250 @@ +package com.wallpaper.wallpaperbox.topon; + +import android.app.Activity; +import android.os.CountDownTimer; +import android.util.Log; + +import androidx.annotation.NonNull; + +import com.anythink.core.api.ATAdInfo; +import com.anythink.core.api.AdError; +import com.anythink.interstitial.api.ATInterstitial; +import com.anythink.interstitial.api.ATInterstitialListener; +import com.wallpaper.wallpaperbox.MyApplication; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class AdManager { + + private static final int type_no_cache = 0; + private static final int type_has_cache = 1; + private static final int type_show_success = 2; + private static final int type_show_close = 3; + private static final int type_show_fail = 4; + + /** + Box_Inter_3 + n67b8202f965e8 + Box_Inter_2 + n67b8202f3bb38 + Box_Inter_1 + n67b8202ede1d8 + */ + + private static final String place1Id = "n67b8202ede1d8"; + private static final String place2Id = "n67b8202f3bb38"; + private static final String place3Id = "n67b8202f965e8"; + + + private static boolean place1LoadFail = false; + private static boolean place2LoadFail = false; + private static boolean place3LoadFail = false; + + private static boolean alreadyShow = false; + + private static List list = new ArrayList<>(); + + + public static void loadAllAd() { + if (list.isEmpty()) { + ATInterstitial mInterstitialAd1 = new ATInterstitial(MyApplication.getContext(), place1Id); + ATInterstitial mInterstitialAd2 = new ATInterstitial(MyApplication.getContext(), place2Id); + ATInterstitial mInterstitialAd3 = new ATInterstitial(MyApplication.getContext(), place3Id); + list.add(mInterstitialAd1); + list.add(mInterstitialAd2); + list.add(mInterstitialAd3); + } + for (ATInterstitial ad : list) { + if (!ad.isAdReady()) { + setCallBack(ad, new AdListener() { + @Override + public void loadFail(@NonNull String placeId) { + if (placeId.equals(place1Id)) { + place1LoadFail = true; + } + if (placeId.equals(place2Id)) { + place2LoadFail = true; + } + if (placeId.equals(place3Id)) { + place3LoadFail = true; + } + } + + @Override + public void showSuccess() { + + } + + @Override + public void showFail() { + + } + + @Override + public void showClose() { + + } + }); + ad.load(); + } + } + + } + + private static ATInterstitial getReadyAd() { + Collections.shuffle(list); + for (ATInterstitial ad : list) { + if (ad.isAdReady()) { + Log.d(MyApplication.TAG, "-has Cache------------"); + return ad; + } + } + Log.d(MyApplication.TAG, "-No Cache------------"); + return null; + } + + private static void setCallBack(ATInterstitial ad, AdListener listener) { + ad.setAdListener(new ATInterstitialListener() { + + + @Override + public void onInterstitialAdLoaded() { + Log.d(MyApplication.TAG, "LoadLoaded " + ad.mPlacementId); + } + + @Override + public void onInterstitialAdLoadFail(AdError adError) { + listener.loadFail(ad.mPlacementId); + Log.d(MyApplication.TAG, "LoadFail:--" + ad.mPlacementId + "--" + adError.getCode() + "---" + adError.getDesc()); + } + + @Override + public void onInterstitialAdClicked(ATAdInfo atAdInfo) { + + } + + @Override + public void onInterstitialAdShow(ATAdInfo atAdInfo) { + Log.d(MyApplication.TAG, "AdShow " + atAdInfo.getShowId()); + listener.showSuccess(); + ad.load(); + } + + @Override + public void onInterstitialAdClose(ATAdInfo atAdInfo) { + listener.showClose(); + } + + @Override + public void onInterstitialAdVideoStart(ATAdInfo atAdInfo) { + + } + + @Override + public void onInterstitialAdVideoEnd(ATAdInfo atAdInfo) { + + } + + @Override + public void onInterstitialAdVideoError(AdError adError) { + + } + }); + } + + public static void setAlreadyShow() { + alreadyShow = false; + } + + + public static CountDownTimer showWelcomeAd( + Activity activity, + Long totalTim, + CountAction countAction, + GoMainAction goMain + ) { + + CountDownTimer timer = new CountDownTimer(totalTim, 100) { + @Override + public void onTick(long millisUntilFinished) { + countAction.onCount(millisUntilFinished); + if (!alreadyShow) { + showAD(activity, new AdStatusAction() { + @Override + public void onStatus(int adType) { + if (adType == type_has_cache) { + alreadyShow = true; + } + if (adType == type_show_close || adType == type_show_fail) { + goMain.onGo(); + } + + } + }); + } + } + + @Override + public void onFinish() { + if (!alreadyShow) { + showTopOn(activity, new onActionListener() { + @Override + public void onAction() { + goMain.onGo(); + } + }); + } + } + }; + + + return timer; + } + + private static void showAD(Activity activity, AdStatusAction action) { + ATInterstitial readyAd = getReadyAd(); + if (readyAd != null) { + action.onStatus(type_has_cache); + setCallBack(readyAd, new AdListener() { + @Override + public void loadFail(@NonNull String placeId) { + + } + + @Override + public void showSuccess() { + action.onStatus(type_show_success); + } + + @Override + public void showFail() { + action.onStatus(type_show_fail); + } + + @Override + public void showClose() { + action.onStatus(type_show_close); + } + }); + readyAd.show(activity); + } else { + action.onStatus(type_no_cache); + + } + } + + + public static void showTopOn(Activity activity, onActionListener listener) { + showAD(activity, new AdStatusAction() { + @Override + public void onStatus(int adType) { + if (adType == type_no_cache || adType == type_show_close || adType == type_show_fail) { + listener.onAction(); + } + } + }); + + } +} diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/topon/AdStatusAction.java b/app/src/main/java/com/wallpaper/wallpaperbox/topon/AdStatusAction.java new file mode 100644 index 0000000..b235305 --- /dev/null +++ b/app/src/main/java/com/wallpaper/wallpaperbox/topon/AdStatusAction.java @@ -0,0 +1,5 @@ +package com.wallpaper.wallpaperbox.topon; + +public interface AdStatusAction { + void onStatus(int adType); +} diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/topon/CountAction.java b/app/src/main/java/com/wallpaper/wallpaperbox/topon/CountAction.java new file mode 100644 index 0000000..223dc37 --- /dev/null +++ b/app/src/main/java/com/wallpaper/wallpaperbox/topon/CountAction.java @@ -0,0 +1,5 @@ +package com.wallpaper.wallpaperbox.topon; + +public interface CountAction { + void onCount(long millisUntilFinished); +} diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/topon/GoMainAction.java b/app/src/main/java/com/wallpaper/wallpaperbox/topon/GoMainAction.java new file mode 100644 index 0000000..0871cc6 --- /dev/null +++ b/app/src/main/java/com/wallpaper/wallpaperbox/topon/GoMainAction.java @@ -0,0 +1,5 @@ +package com.wallpaper.wallpaperbox.topon; + +public interface GoMainAction { + void onGo(); +} diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/topon/onActionListener.java b/app/src/main/java/com/wallpaper/wallpaperbox/topon/onActionListener.java new file mode 100644 index 0000000..d345311 --- /dev/null +++ b/app/src/main/java/com/wallpaper/wallpaperbox/topon/onActionListener.java @@ -0,0 +1,6 @@ +package com.wallpaper.wallpaperbox.topon; + +public interface onActionListener { + + void onAction(); +} diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/DetailActivity.java b/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/DetailActivity.java index ba23e63..c2bffee 100644 --- a/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/DetailActivity.java +++ b/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/DetailActivity.java @@ -29,6 +29,8 @@ import com.google.android.material.bottomsheet.BottomSheetDialog; import com.wallpaper.wallpaperbox.R; import com.wallpaper.wallpaperbox.data.entity.WallpaperEntity; import com.wallpaper.wallpaperbox.databinding.ActivityDetailBinding; +import com.wallpaper.wallpaperbox.topon.AdManager; +import com.wallpaper.wallpaperbox.topon.onActionListener; import com.wallpaper.wallpaperbox.ui.viewmodel.WallpaperViewModel; import com.wallpaper.wallpaperbox.util.WallpaperUtils; @@ -65,6 +67,8 @@ public class DetailActivity extends AppCompatActivity { } private void initializeData() { + AdManager.loadAllAd(); + wallpaperEntity = (WallpaperEntity) getIntent().getSerializableExtra("wallpaper"); if (wallpaperEntity != null) { imagePathOriginal = wallpaperEntity.getOriginal(); @@ -85,7 +89,14 @@ public class DetailActivity extends AppCompatActivity { private void initializeEvents() { showProgress(); - binding.back.setOnClickListener(v -> finish()); + binding.back.setOnClickListener(v -> { + AdManager.showTopOn(DetailActivity.this, new onActionListener() { + @Override + public void onAction() { + finish(); + } + }); + }); binding.like.setOnClickListener(v -> { boolean newStatus = !wallpaperEntity.getLike(); @@ -93,11 +104,23 @@ public class DetailActivity extends AppCompatActivity { wallpaperViewModel.update(wallpaperEntity); }); - binding.set.setOnClickListener(v -> showCustomBottomSheetDialog()); + binding.set.setOnClickListener(v -> { + AdManager.showTopOn(DetailActivity.this, new onActionListener() { + @Override + public void onAction() { + showCustomBottomSheetDialog(); + } + }); + }); binding.downPicture.setOnClickListener(v -> { - showProgress(); - wallpaperUtils.saveToGallery(this, imagePathSource); + AdManager.showTopOn(DetailActivity.this, new onActionListener() { + @Override + public void onAction() { + showProgress(); + wallpaperUtils.saveToGallery(DetailActivity.this, imagePathSource); + } + }); }); loadImage(); diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/MainActivity.java b/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/MainActivity.java index f308a72..7bec85e 100644 --- a/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/MainActivity.java +++ b/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/MainActivity.java @@ -15,6 +15,7 @@ import com.google.android.material.tabs.TabLayoutMediator; import com.wallpaper.wallpaperbox.R; import com.wallpaper.wallpaperbox.databinding.ActivityMainBinding; import com.wallpaper.wallpaperbox.databinding.MainCustomBinding; +import com.wallpaper.wallpaperbox.topon.AdManager; import com.wallpaper.wallpaperbox.ui.adapter.MainAdapter; public class MainActivity extends AppCompatActivity { @@ -38,6 +39,8 @@ public class MainActivity extends AppCompatActivity { } private void initData() { + AdManager.loadAllAd(); + MainAdapter adapter = new MainAdapter(this); binding.mainViewpager2.setAdapter(adapter); } diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/SplashActivity.java b/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/SplashActivity.java index 0d02a49..4b96dd5 100644 --- a/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/SplashActivity.java +++ b/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/SplashActivity.java @@ -15,12 +15,13 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.wallpaper.wallpaperbox.R; import com.wallpaper.wallpaperbox.databinding.ActivitySplashBinding; +import com.wallpaper.wallpaperbox.topon.AdManager; public class SplashActivity extends AppCompatActivity { private ActivitySplashBinding binding; - private static final long TOTAL_TIME = 3000; + private static final long TOTAL_TIME = 11000; private CountDownTimer countDownTimer; @Override @@ -37,25 +38,21 @@ public class SplashActivity extends AppCompatActivity { return insets; }); - ProgressBar progressBar = binding.progressBar; + AdManager.loadAllAd(); + + AdManager.setAlreadyShow(); Glide.with(this) .load(R.mipmap.ic_launcher) .transform(new RoundedCorners(16)) .into(binding.splashImage); - countDownTimer = new CountDownTimer(TOTAL_TIME, 100) { - @Override - public void onTick(long millisUntilFinished) { - int percentage = (int) (100 - (float) millisUntilFinished / TOTAL_TIME * 100); - progressBar.setProgress(percentage); - } - - @Override - public void onFinish() { - startMain(); - } - }; + countDownTimer = AdManager.showWelcomeAd(this, TOTAL_TIME, millisUntilFinished -> { + int percentage = (int) (100 - (float) millisUntilFinished / TOTAL_TIME * 100); + binding.progressBar.setProgress(percentage); + }, + this::startMain + ); countDownTimer.start(); } diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/WallpaperListActivity.java b/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/WallpaperListActivity.java index adb213d..cf8e481 100644 --- a/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/WallpaperListActivity.java +++ b/app/src/main/java/com/wallpaper/wallpaperbox/ui/activity/WallpaperListActivity.java @@ -15,6 +15,8 @@ import androidx.recyclerview.widget.StaggeredGridLayoutManager; import com.wallpaper.wallpaperbox.R; import com.wallpaper.wallpaperbox.data.entity.WallpaperEntity; import com.wallpaper.wallpaperbox.databinding.ActivityWallpaperListBinding; +import com.wallpaper.wallpaperbox.topon.AdManager; +import com.wallpaper.wallpaperbox.topon.onActionListener; import com.wallpaper.wallpaperbox.ui.adapter.WallpaperAdapter; import com.wallpaper.wallpaperbox.ui.viewmodel.WallpaperViewModel; import com.wallpaper.wallpaperbox.util.ItemDecoration; @@ -63,7 +65,14 @@ public class WallpaperListActivity extends AppCompatActivity { } private void initEvent() { - binding.back.setOnClickListener(view -> finish()); + binding.back.setOnClickListener(v -> { + AdManager.showTopOn(WallpaperListActivity.this, new onActionListener() { + @Override + public void onAction() { + finish(); + } + }); + }); binding.title.setText(name); getCategoryByName(); diff --git a/app/src/main/java/com/wallpaper/wallpaperbox/ui/adapter/WallpaperAdapter.java b/app/src/main/java/com/wallpaper/wallpaperbox/ui/adapter/WallpaperAdapter.java index b47b656..502d960 100644 --- a/app/src/main/java/com/wallpaper/wallpaperbox/ui/adapter/WallpaperAdapter.java +++ b/app/src/main/java/com/wallpaper/wallpaperbox/ui/adapter/WallpaperAdapter.java @@ -17,6 +17,8 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.wallpaper.wallpaperbox.R; import com.wallpaper.wallpaperbox.data.entity.WallpaperEntity; +import com.wallpaper.wallpaperbox.topon.AdManager; +import com.wallpaper.wallpaperbox.topon.onActionListener; import com.wallpaper.wallpaperbox.ui.activity.DetailActivity; import com.wallpaper.wallpaperbox.ui.activity.WallpaperListActivity; import com.wallpaper.wallpaperbox.ui.viewmodel.WallpaperViewModel; @@ -108,15 +110,20 @@ public class WallpaperAdapter extends RecyclerView.Adapter { - Intent intent; - if (type == 0) { - intent = new Intent(activity, WallpaperListActivity.class); - intent.putExtra("name", wallpaperEntity.getName()); - } else { - intent = new Intent(activity, DetailActivity.class); - intent.putExtra("wallpaper", wallpaperEntity); - } - activity.startActivity(intent); + AdManager.showTopOn(activity, new onActionListener() { + @Override + public void onAction() { + Intent intent; + if (type == 0) { + intent = new Intent(activity, WallpaperListActivity.class); + intent.putExtra("name", wallpaperEntity.getName()); + } else { + intent = new Intent(activity, DetailActivity.class); + intent.putExtra("wallpaper", wallpaperEntity); + } + activity.startActivity(intent); + } + }); }); favorite.setOnClickListener(view -> toggleFavorite(wallpaperEntity)); diff --git a/build.gradle.kts b/build.gradle.kts index 3756278..2d9380e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { alias(libs.plugins.android.application) apply false + + id("com.google.gms.google-services") version "4.3.15" apply false + id ("com.google.firebase.crashlytics") version "2.9.2" apply false } \ No newline at end of file diff --git a/keystore.properties b/keystore.properties index fd7c8b8..5565f0b 100644 --- a/keystore.properties +++ b/keystore.properties @@ -3,4 +3,4 @@ package_name=com.wallpaper.wallpaperbox keystoreFile=app/WallpaperBox.jks key_alias=WallpaperBoxkey0 key_store_password=WallpaperBox -key_password=WallpaperBox +key_password=WallpaperBox \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 4242665..a0befa8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,28 @@ dependencyResolutionManagement { repositories { google() mavenCentral() + + //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") + + //TopOn集成测试工具 +// maven ( "https://jfrog.anythinktech.com/artifactory/debugger") } }