diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 52b23e3..971315e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,8 +6,8 @@ plugins { id("org.jetbrains.kotlin.android") id("io.objectbox") kotlin("kapt") -// 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 { @@ -19,8 +19,8 @@ android { applicationId = "com.wall.wallpaper.hd" minSdk = 23 targetSdk = 34 - versionCode = 1 - versionName = "1.0.0" + versionCode = 2 + versionName = "1.0.1" setProperty("archivesBaseName", "Wallpaper 4K HD_V" + versionName + "(${versionCode})_$timestamp") testInstrumentationRunner = "androidx.live.runner.AndroidJUnitRunner" @@ -62,99 +62,99 @@ dependencies { //------------------firebase -// implementation(platform("com.google.firebase:firebase-bom:33.1.1")) -// 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.1.1")) + 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") -// + //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.0.7") diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..26dda16 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,29 @@ +{ + "project_info": { + "project_number": "550277547", + "project_id": "wallpaper-4k-hd-521cf", + "storage_bucket": "wallpaper-4k-hd-521cf.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:550277547:android:653aebad71b0a7bc3142ee", + "android_client_info": { + "package_name": "com.wall.wallpaper.hd" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyCupLI38G-GnabfQ5LYfv57ljc3tocEwe8" + } + ], + "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 3283c30..9b6c031 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -25,4 +25,135 @@ -keepattributes AnnotationDefault,RuntimeVisibleAnnotations +#---------------------------------------------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 + + + diff --git a/app/src/main/java/com/wall/wallpaper/hd/WallApp.java b/app/src/main/java/com/wall/wallpaper/hd/WallApp.java index 0b72e46..93e678d 100644 --- a/app/src/main/java/com/wall/wallpaper/hd/WallApp.java +++ b/app/src/main/java/com/wall/wallpaper/hd/WallApp.java @@ -5,6 +5,9 @@ import android.content.Context; import android.graphics.Typeface; import android.util.Log; +import com.anythink.core.api.ATSDK; +import com.anythink.core.api.NetTrafficeCallback; +import com.wall.wallpaper.hd.ad.AdManager; import com.wall.wallpaper.hd.tools.CommonUtils; import com.wall.wallpaper.hd.tools.JsonData; import com.wall.wallpaper.hd.tools.DbManager; @@ -40,7 +43,7 @@ public class WallApp extends Application { super.onCreate(); mAppContext = this; defaultFont = Typeface.createFromAsset(getAssets(), "custfont.ttf"); - + initTop(); DbManager.init(this); executor = Executors.newFixedThreadPool(8); String[] names = {wallpaperName, animasName, exName, filmName, natureName, pattName, streetName, travelName}; @@ -81,28 +84,28 @@ public class WallApp extends Application { } -// private void initTop(){ -// ATSDK.checkIsEuTraffic(this, new NetTrafficeCallback() { -// -// @Override -// public void onResultCallback(boolean isEU) { -// Log.e(TAG, "onResultCallback:" + isEU); -// if (isEU && ATSDK.getGDPRDataLevel( MyApp.mAppContext) == ATSDK.UNKNOWN) { -// ATSDK.showGdprAuth(MyApp.mAppContext); -// } -// -// } -// -// @Override -// public void onErrorCallback(String errorMsg) { -// Log.e(TAG, "onErrorCallback:" + errorMsg); -// } -// }); -// -// ATSDK.init( this, APPId, AppKey); -// //测试工具 -//// ATDebuggerUITest.showDebuggerUI(this,debug_Key); -// AdManager.loadAllAd(); -// -// } + private void initTop(){ + String APPId = "h67e3658322427"; + String AppKey = "aea386cf8d6f2dec3593d9d996ae1f5ed"; + ATSDK.checkIsEuTraffic(this, new NetTrafficeCallback() { + + @Override + public void onResultCallback(boolean isEU) { + if (isEU && ATSDK.getGDPRDataLevel( WallApp.mAppContext) == ATSDK.UNKNOWN) { + ATSDK.showGdprAuth(WallApp.mAppContext); + } + + } + + @Override + public void onErrorCallback(String errorMsg) { + } + }); + + ATSDK.init( this, APPId, AppKey); + //测试工具 +// ATDebuggerUITest.showDebuggerUI(this,"529b9d845e53ac839536d321c0b6be5f6928b24d"); + AdManager.loadAllAd(); + + } } diff --git a/app/src/main/java/com/wall/wallpaper/hd/ad/AdListener.java b/app/src/main/java/com/wall/wallpaper/hd/ad/AdListener.java new file mode 100644 index 0000000..3d4ab6d --- /dev/null +++ b/app/src/main/java/com/wall/wallpaper/hd/ad/AdListener.java @@ -0,0 +1,10 @@ +package com.wall.wallpaper.hd.ad; + +public interface AdListener { + void loadFail(String placeId); + void showSuccess(); + + void showFail(); + + void showClose(); +} diff --git a/app/src/main/java/com/wall/wallpaper/hd/ad/AdManager.java b/app/src/main/java/com/wall/wallpaper/hd/ad/AdManager.java new file mode 100644 index 0000000..a30eb27 --- /dev/null +++ b/app/src/main/java/com/wall/wallpaper/hd/ad/AdManager.java @@ -0,0 +1,253 @@ +package com.wall.wallpaper.hd.ad; + +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.wall.wallpaper.hd.WallApp; + +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; + + + private static final String place1Id = "n67e36632c58e4"; + private static final String place2Id = "n67e3661129a6c"; + private static final String place3Id = "n67e365f9e8634"; + + + 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<>(); + + + private static String Ad_TAG = WallApp.TAG; + public static void loadAllAd() { + place1LoadFail = false; + place2LoadFail = false; + place3LoadFail = false; + if (list.size() == 0) { + ATInterstitial mInterstitialAd1 = new ATInterstitial(WallApp.mAppContext, place1Id); + ATInterstitial mInterstitialAd2 = new ATInterstitial(WallApp.mAppContext, place2Id); + ATInterstitial mInterstitialAd3 = new ATInterstitial(WallApp.mAppContext, 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(Ad_TAG, "-has Cache------------"); + return ad; + } + } + Log.d(Ad_TAG, "-No Cache------------"); + return null; + } + + private static void setCallBack(ATInterstitial ad, AdListener listener) { + ad.setAdListener(new ATInterstitialListener() { + + + @Override + public void onInterstitialAdLoaded() { + Log.d(Ad_TAG, "LoadLoaded " + ad.mPlacementId); + } + + @Override + public void onInterstitialAdLoadFail(AdError adError) { + listener.loadFail(ad.mPlacementId); + Log.d(Ad_TAG, "LoadFail:--" + ad.mPlacementId + "--" + adError.getCode() + "---" + adError.getDesc()); + } + + @Override + public void onInterstitialAdClicked(ATAdInfo atAdInfo) { + + } + + @Override + public void onInterstitialAdShow(ATAdInfo atAdInfo) { + Log.d(Ad_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 CountDownTimer showWelcomeAd( + Activity activity, + Long totalTim, + CountAction countAction, + GoMainAction goMain + ) { + Log.d(Ad_TAG,"----------alreadyShow="+alreadyShow); + alreadyShow = false; + 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(place1LoadFail&&place2LoadFail&&place3LoadFail){ + Log.d(Ad_TAG,"------------all load fail"); + alreadyShow = true; + goMain.onGo(); + } + 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/wall/wallpaper/hd/ad/AdStatusAction.java b/app/src/main/java/com/wall/wallpaper/hd/ad/AdStatusAction.java new file mode 100644 index 0000000..689e8bf --- /dev/null +++ b/app/src/main/java/com/wall/wallpaper/hd/ad/AdStatusAction.java @@ -0,0 +1,5 @@ +package com.wall.wallpaper.hd.ad; + +public interface AdStatusAction { + void onStatus(int adType); +} diff --git a/app/src/main/java/com/wall/wallpaper/hd/ad/CountAction.java b/app/src/main/java/com/wall/wallpaper/hd/ad/CountAction.java new file mode 100644 index 0000000..0d5405b --- /dev/null +++ b/app/src/main/java/com/wall/wallpaper/hd/ad/CountAction.java @@ -0,0 +1,5 @@ +package com.wall.wallpaper.hd.ad; + +public interface CountAction { + void onCount(long millisUntilFinished); +} diff --git a/app/src/main/java/com/wall/wallpaper/hd/ad/GoMainAction.java b/app/src/main/java/com/wall/wallpaper/hd/ad/GoMainAction.java new file mode 100644 index 0000000..6f9b555 --- /dev/null +++ b/app/src/main/java/com/wall/wallpaper/hd/ad/GoMainAction.java @@ -0,0 +1,5 @@ +package com.wall.wallpaper.hd.ad; + +public interface GoMainAction { + void onGo(); +} diff --git a/app/src/main/java/com/wall/wallpaper/hd/ad/onActionListener.java b/app/src/main/java/com/wall/wallpaper/hd/ad/onActionListener.java new file mode 100644 index 0000000..5f56d87 --- /dev/null +++ b/app/src/main/java/com/wall/wallpaper/hd/ad/onActionListener.java @@ -0,0 +1,6 @@ +package com.wall.wallpaper.hd.ad; + +public interface onActionListener { + + void onAction(); +} diff --git a/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityMain.java b/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityMain.java index a1d911b..87d46b7 100644 --- a/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityMain.java +++ b/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityMain.java @@ -11,6 +11,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter; import com.google.android.material.tabs.TabLayout; import com.wall.wallpaper.hd.R; +import com.wall.wallpaper.hd.ad.AdManager; import com.wall.wallpaper.hd.databinding.ActivityMainBinding; import com.wall.wallpaper.hd.databinding.ItemTabBinding; import com.wall.wallpaper.hd.tools.CommonUtils; @@ -29,7 +30,7 @@ public class ActivityMain extends AppCompatActivity { vb = ActivityMainBinding.inflate(getLayoutInflater()); CommonUtils.initFull(this,true); setContentView(vb.getRoot()); - + AdManager.loadAllAd(); List list = new ArrayList<>(); list.add(FragmentMain.newInstance(0)); diff --git a/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivitySetWallpaper.java b/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivitySetWallpaper.java index 08e1ba0..97ffa95 100644 --- a/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivitySetWallpaper.java +++ b/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivitySetWallpaper.java @@ -25,6 +25,8 @@ import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; import com.wall.wallpaper.hd.R; import com.wall.wallpaper.hd.WallApp; +import com.wall.wallpaper.hd.ad.AdManager; +import com.wall.wallpaper.hd.ad.onActionListener; import com.wall.wallpaper.hd.databinding.ActivitySetWallpaperBinding; import com.wall.wallpaper.hd.javabean.Data; import com.wall.wallpaper.hd.listener.TypeListener; @@ -68,6 +70,7 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe CommonUtils.initFull(this, true); setContentView(vb.getRoot()); weakReference = new WeakReference<>(this); + AdManager.loadAllAd(); data = (Data) getIntent().getSerializableExtra(CommonUtils.key_info); if (data == null) { return; @@ -78,15 +81,18 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe initClick(); loadDetail(); vb.tvContent.setText(data.getDescription()); + AdManager.showTopOn(ActivitySetWallpaper.this, new onActionListener() { + @Override + public void onAction() { + + } + }); } private void loadDetail() { String previewUrl400 = data.getPreviewUrl400(); String previewUrl1080 = data.getPreviewUrl1080(); -// String previewUrl200 = data.getPreviewUrl200(); -// String authorHeader = data.getAuthorHeader(); -// String authorName = data.getAuthorName(); -// String authorHtml = data.getAuthorHtml(); + fullUrl = data.getFullUrl(); File file = new File(mSavePath); @@ -151,7 +157,14 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe vb.imageviewBack.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - finish(); + + AdManager.showTopOn(ActivitySetWallpaper.this, new onActionListener() { + @Override + public void onAction() { + finish(); + } + }); + } }); @@ -160,9 +173,17 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe dialogType = new DialogType(); dialogType.setListener(ActivitySetWallpaper.this); } - if (!dialogType.isAdded()) { - dialogType.show(getSupportFragmentManager(), ""); - } + AdManager.showTopOn(ActivitySetWallpaper.this, new onActionListener() { + @Override + public void onAction() { + if (!dialogType.isAdded()) { + dialogType.show(getSupportFragmentManager(), ""); + } + } + }); + + + }); @@ -180,11 +201,19 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe vb.layoutDownload.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - boolean permission = JsonData.INSTANCE.requestPermission(ActivitySetWallpaper.this, permissionCode); - if (!permission) { - return; - } - startSaveToAlbum(); + + + AdManager.showTopOn(ActivitySetWallpaper.this, new onActionListener() { + @Override + public void onAction() { + boolean permission = JsonData.INSTANCE.requestPermission(ActivitySetWallpaper.this, permissionCode); + if (!permission) { + return; + } + startSaveToAlbum(); + } + }); + } @@ -193,18 +222,13 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe private void startSaveToAlbum() { showDownloadLoading(true); -// File file = new File(mSavePath); -// if (file.exists()) { -// Log.d(MyWallpaper.TAG, "-----------Download 1"); -// startSave(file); -// return; -// } + if (downloadFile != null && downloadFile.exists()) { - Log.d(WallApp.TAG, "-----------Download 2"); + startSave(downloadFile); return; } - Log.d(WallApp.TAG, "-----------Download 3"); + doDownload(true, true); } @@ -224,13 +248,8 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe public void run() { ActivitySetWallpaper activity = weakReference.get(); if (activity != null && !activity.isDestroyed()) { - Log.d(WallApp.TAG, "-------weakReference !=null"); -// Glide.with(activity) -// .asDrawable() -// .load(downloadFile) -// .into(vb.imageviewPreview); } else { - Log.d(WallApp.TAG, "-------weakReference null"); + } } @@ -264,7 +283,6 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe } private void showSetWallpaperLoading(boolean show) { - Log.d(WallApp.TAG, "-----------showSetWallpaperLoading" + show); if (show) { vb.pbSet.setVisibility(View.VISIBLE); vb.buttonSet.setVisibility(View.GONE); @@ -295,7 +313,7 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe // deleteCacheFile(); Toast.makeText(ActivitySetWallpaper.this, getString(R.string.save_success), Toast.LENGTH_SHORT).show(); } - Log.d(WallApp.TAG, "--------path=" + file.getAbsolutePath() + "---uri=" + uri); + } }); @@ -310,21 +328,11 @@ public class ActivitySetWallpaper extends AppCompatActivity implements TypeListe new Thread(new Runnable() { @Override public void run() { - Log.d(WallApp.TAG, "--------downloadFile=" + downloadFile.exists()); + setWallpaper(downloadFile, type); } }).start(); - } -// else if (fullDrawable != null) { -// new Thread(new Runnable() { -// @Override -// public void run() { -// File file = new File(CommonHelper.saveDrawableToFile(fullDrawable, mSavePath)); -// setWallpaper(file, type); -// } -// }).start(); -// } - else { + } else { call = JsonData.INSTANCE.downloadFile(fullUrl, mSavePath, new Function2() { @Override public Unit invoke(Boolean aBoolean, InputStream inputStream) { diff --git a/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityWallList.java b/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityWallList.java index 5d9c9ca..be51497 100644 --- a/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityWallList.java +++ b/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityWallList.java @@ -7,6 +7,8 @@ import android.view.View; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.GridLayoutManager; +import com.wall.wallpaper.hd.ad.AdManager; +import com.wall.wallpaper.hd.ad.onActionListener; import com.wall.wallpaper.hd.adapter.AdapterList; import com.wall.wallpaper.hd.databinding.ActivityWallListBinding; import com.wall.wallpaper.hd.javabean.Data; @@ -30,12 +32,27 @@ public class ActivityWallList extends AppCompatActivity implements ItemClickList setContentView(vb.getRoot()); CommonUtils.initFull(this, true); categoryName = getIntent().getStringExtra(key_index); + AdManager.loadAllAd(); vb.name.setText(categoryName); initList(); vb.imageviewBack.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - finish(); + + AdManager.showTopOn(ActivityWallList.this, new onActionListener() { + @Override + public void onAction() { + finish(); + } + }); + + } + }); + + AdManager.showTopOn(ActivityWallList.this, new onActionListener() { + @Override + public void onAction() { + } }); } diff --git a/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityWelcome.java b/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityWelcome.java index 8da1b0b..56bf50e 100644 --- a/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityWelcome.java +++ b/app/src/main/java/com/wall/wallpaper/hd/ui_view/ActivityWelcome.java @@ -7,6 +7,9 @@ import android.os.CountDownTimer; import androidx.appcompat.app.AppCompatActivity; +import com.wall.wallpaper.hd.ad.AdManager; +import com.wall.wallpaper.hd.ad.CountAction; +import com.wall.wallpaper.hd.ad.GoMainAction; import com.wall.wallpaper.hd.databinding.ActivityWelcomeBinding; import com.wall.wallpaper.hd.tools.CommonUtils; @@ -15,7 +18,7 @@ public class ActivityWelcome extends AppCompatActivity { private CountDownTimer countDownTimer; private ActivityWelcomeBinding vb; - private long totalTime = 1600; + private long totalTime = 11600; @SuppressLint("MissingInflatedId") @Override @@ -25,44 +28,24 @@ public class ActivityWelcome extends AppCompatActivity { CommonUtils.initFull(this,true); setContentView(vb.getRoot()); - - countDownTimer = new CountDownTimer(totalTime,100) { + countDownTimer = AdManager.showWelcomeAd(ActivityWelcome.this, totalTime, new CountAction() { @Override - public void onTick(long millisUntilFinished) { + public void onCount(long millisUntilFinished) { int progressPercentage = (int) ((100 * millisUntilFinished) / totalTime); int countdownPercentage = 100 - progressPercentage; vb.progressbar.setProgress(countdownPercentage); } - + }, new GoMainAction() { @Override - public void onFinish() { + public void onGo() { vb.progressbar.setProgress(100); Intent intent = new Intent(ActivityWelcome.this, ActivityMain.class); startActivity(intent); finish(); } - }; - -// countDownTimer = AdManager.showWelcomeAd(this, totalTime, new CountAction() { -// @Override -// public void onCount(long millisUntilFinished) { -// int progressPercentage = (int) ((100 * millisUntilFinished) / totalTime); -// -// int countdownPercentage = 100 - progressPercentage; -// -// vb.progressbar.setProgress(countdownPercentage); -// } -// }, new GoMainAction() { -// @Override -// public void onGo() { -// vb.progressbar.setProgress(100); -// Intent intent = new Intent(WElActivity.this, HomeActivity.class); -// startActivity(intent); -// finish(); -// } -// }); + }); countDownTimer.start(); } diff --git a/app/src/main/java/com/wall/wallpaper/hd/ui_view/FragmentSearch.java b/app/src/main/java/com/wall/wallpaper/hd/ui_view/FragmentSearch.java index c6a4cfe..27b21d7 100644 --- a/app/src/main/java/com/wall/wallpaper/hd/ui_view/FragmentSearch.java +++ b/app/src/main/java/com/wall/wallpaper/hd/ui_view/FragmentSearch.java @@ -18,6 +18,8 @@ import androidx.recyclerview.widget.GridLayoutManager; import com.wall.wallpaper.hd.R; import com.wall.wallpaper.hd.WallApp; +import com.wall.wallpaper.hd.ad.AdManager; +import com.wall.wallpaper.hd.ad.onActionListener; import com.wall.wallpaper.hd.adapter.AdapterList; import com.wall.wallpaper.hd.databinding.FragSearchBinding; import com.wall.wallpaper.hd.javabean.Data; @@ -80,7 +82,12 @@ public class FragmentSearch extends Fragment implements ItemClickListener { @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { if (actionId == EditorInfo.IME_ACTION_SEARCH) { - startSearch(); + AdManager.showTopOn(requireActivity(), new onActionListener() { + @Override + public void onAction() { + startSearch(); + } + }); return true; } return false; @@ -89,7 +96,14 @@ public class FragmentSearch extends Fragment implements ItemClickListener { vb.btnSearch.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startSearch(); + + AdManager.showTopOn(requireActivity(), new onActionListener() { + @Override + public void onAction() { + startSearch(); + } + }); + } }); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 14dbd39..33d4015 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Photo Wallpaper + Wallpaper 4K HD Failed to set wallpaper, please try again Set wallpaper successfully Download failed diff --git a/settings.gradle.kts b/settings.gradle.kts index c5c7f6b..9348245 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,25 +11,25 @@ dependencyResolutionManagement { 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") + + //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")