From faf7950517ffc86ad91e5c4e89373e1aa2283ce5 Mon Sep 17 00:00:00 2001 From: lihongwei Date: Mon, 12 May 2025 10:56:34 +0800 Subject: [PATCH] =?UTF-8?q?V1.0.1=EF=BC=882=EF=BC=89=E6=8E=A5=E5=85=A5topo?= =?UTF-8?q?n=E5=92=8Cfirebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 105 +++++++- app/google-services.json | 29 ++ app/proguard-rules.pro | 131 ++++++++- .../com/ar/ardrawingboard/MyApplication.java | 38 +++ .../ar/ardrawingboard/topon/AdListener.java | 10 + .../ar/ardrawingboard/topon/AdManager.java | 250 ++++++++++++++++++ .../ardrawingboard/topon/AdStatusAction.java | 5 + .../ar/ardrawingboard/topon/CountAction.java | 5 + .../ar/ardrawingboard/topon/GoMainAction.java | 5 + .../topon/onActionListener.java | 6 + .../ui/activity/BoardActivity.java | 37 ++- .../ui/activity/CategoryActivity.java | 17 +- .../ui/activity/MainActivity.java | 3 + .../ui/activity/SplashActivity.java | 24 +- build.gradle.kts | 3 + gradle.properties | 2 +- gradle/libs.versions.toml | 2 +- settings.gradle.kts | 22 ++ 18 files changed, 672 insertions(+), 22 deletions(-) create mode 100644 app/google-services.json create mode 100644 app/src/main/java/com/ar/ardrawingboard/topon/AdListener.java create mode 100644 app/src/main/java/com/ar/ardrawingboard/topon/AdManager.java create mode 100644 app/src/main/java/com/ar/ardrawingboard/topon/AdStatusAction.java create mode 100644 app/src/main/java/com/ar/ardrawingboard/topon/CountAction.java create mode 100644 app/src/main/java/com/ar/ardrawingboard/topon/GoMainAction.java create mode 100644 app/src/main/java/com/ar/ardrawingboard/topon/onActionListener.java diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a733ef1..6084a9e 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.ar.ardrawingboard" minSdk = 23 targetSdk = 35 - versionCode = 1 - versionName = "1.0.0" + versionCode = 2 + versionName = "1.0.1" setProperty("archivesBaseName", "AR Drawing Board_V" + versionName + "(${versionCode})_$timestamp") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -59,4 +61,103 @@ dependencies { implementation ("androidx.camera:camera-view:1.4.2") implementation ("androidx.camera:camera-extensions:1.4.2") implementation ("androidx.camera:camera-camera2:1.4.2") + + // 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..746b420 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,29 @@ +{ + "project_info": { + "project_number": "100699432553", + "project_id": "ar-drawing-board", + "storage_bucket": "ar-drawing-board.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:100699432553:android:0d5c1aa1af55ca7d55a4f8", + "android_client_info": { + "package_name": "com.ar.ardrawingboard" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyCzlMvoO1_0d9VlhX23xrEAhZHayprgnf4" + } + ], + "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 f067c54..cbe0d81 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -31,4 +31,133 @@ -keep class com.ar.ardrawingboard.room.AppDatabase { *; } -keep class com.ar.ardrawingboard.room.BoardEntry { *; } --keep class com.ar.ardrawingboard.room.BoardEntryDao { *; } \ No newline at end of file +-keep class com.ar.ardrawingboard.room.BoardEntryDao { *; } + +#---------------------------------------------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/ar/ardrawingboard/MyApplication.java b/app/src/main/java/com/ar/ardrawingboard/MyApplication.java index 205cc13..2526472 100644 --- a/app/src/main/java/com/ar/ardrawingboard/MyApplication.java +++ b/app/src/main/java/com/ar/ardrawingboard/MyApplication.java @@ -3,7 +3,11 @@ package com.ar.ardrawingboard; 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.ar.ardrawingboard.topon.AdManager; import com.ar.ardrawingboard.util.RoomInit; import java.io.IOException; @@ -22,6 +26,12 @@ public class MyApplication extends Application { private static final String PREF_NAME = "app_preferences"; private static final String KEY_INIT = "isInit"; + public static final String TAG = "--------------"; + + private static final String AppKey = "a8e977e907379b1057704fe995baa4389"; + private static final String APPId = "h682153551167d"; + private static final String debug_KEy = "d0a434af69020f58cd1c246da4adb0630eb18a02"; + @Override public void onCreate() { super.onCreate(); @@ -36,6 +46,34 @@ public class MyApplication extends Application { preferences.edit().putBoolean(KEY_INIT, true).apply(); } + 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/ar/ardrawingboard/topon/AdListener.java b/app/src/main/java/com/ar/ardrawingboard/topon/AdListener.java new file mode 100644 index 0000000..713c099 --- /dev/null +++ b/app/src/main/java/com/ar/ardrawingboard/topon/AdListener.java @@ -0,0 +1,10 @@ +package com.ar.ardrawingboard.topon; + +public interface AdListener { + void loadFail(String placeId); + void showSuccess(); + + void showFail(); + + void showClose(); +} diff --git a/app/src/main/java/com/ar/ardrawingboard/topon/AdManager.java b/app/src/main/java/com/ar/ardrawingboard/topon/AdManager.java new file mode 100644 index 0000000..c88b051 --- /dev/null +++ b/app/src/main/java/com/ar/ardrawingboard/topon/AdManager.java @@ -0,0 +1,250 @@ +package com.ar.ardrawingboard.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.ar.ardrawingboard.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; + + /** + Board_INTER_3 + n682153a4631e7 + Board_INTER_2 + n6821539194d8e + Board_INTER_1 + n6821537f5b17c + */ + + private static final String place1Id = "n6821537f5b17c"; + private static final String place2Id = "n6821539194d8e"; + private static final String place3Id = "n682153a4631e7"; + + + 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/ar/ardrawingboard/topon/AdStatusAction.java b/app/src/main/java/com/ar/ardrawingboard/topon/AdStatusAction.java new file mode 100644 index 0000000..a018c36 --- /dev/null +++ b/app/src/main/java/com/ar/ardrawingboard/topon/AdStatusAction.java @@ -0,0 +1,5 @@ +package com.ar.ardrawingboard.topon; + +public interface AdStatusAction { + void onStatus(int adType); +} diff --git a/app/src/main/java/com/ar/ardrawingboard/topon/CountAction.java b/app/src/main/java/com/ar/ardrawingboard/topon/CountAction.java new file mode 100644 index 0000000..247a8b6 --- /dev/null +++ b/app/src/main/java/com/ar/ardrawingboard/topon/CountAction.java @@ -0,0 +1,5 @@ +package com.ar.ardrawingboard.topon; + +public interface CountAction { + void onCount(long millisUntilFinished); +} diff --git a/app/src/main/java/com/ar/ardrawingboard/topon/GoMainAction.java b/app/src/main/java/com/ar/ardrawingboard/topon/GoMainAction.java new file mode 100644 index 0000000..ad97831 --- /dev/null +++ b/app/src/main/java/com/ar/ardrawingboard/topon/GoMainAction.java @@ -0,0 +1,5 @@ +package com.ar.ardrawingboard.topon; + +public interface GoMainAction { + void onGo(); +} diff --git a/app/src/main/java/com/ar/ardrawingboard/topon/onActionListener.java b/app/src/main/java/com/ar/ardrawingboard/topon/onActionListener.java new file mode 100644 index 0000000..f22ef4a --- /dev/null +++ b/app/src/main/java/com/ar/ardrawingboard/topon/onActionListener.java @@ -0,0 +1,6 @@ +package com.ar.ardrawingboard.topon; + +public interface onActionListener { + + void onAction(); +} diff --git a/app/src/main/java/com/ar/ardrawingboard/ui/activity/BoardActivity.java b/app/src/main/java/com/ar/ardrawingboard/ui/activity/BoardActivity.java index c3c74ce..328c454 100644 --- a/app/src/main/java/com/ar/ardrawingboard/ui/activity/BoardActivity.java +++ b/app/src/main/java/com/ar/ardrawingboard/ui/activity/BoardActivity.java @@ -25,6 +25,8 @@ import androidx.core.content.ContextCompat; import com.ar.ardrawingboard.R; import com.ar.ardrawingboard.databinding.ActivityBoardBinding; +import com.ar.ardrawingboard.topon.AdManager; +import com.ar.ardrawingboard.topon.onActionListener; import com.ar.ardrawingboard.util.CommonUtils; import com.ar.ardrawingboard.util.ImageUtils; import com.ar.ardrawingboard.util.PermissionUtils; @@ -68,6 +70,14 @@ public class BoardActivity extends AppCompatActivity { uiBinding = ActivityBoardBinding.inflate(getLayoutInflater()); setContentView(uiBinding.getRoot()); displayImageView = uiBinding.imageFull; + + AdManager.loadAllAd(); + AdManager.showTopOn(this, new onActionListener() { + @Override + public void onAction() { + + } + }); } private void configureImageView() { @@ -90,11 +100,32 @@ public class BoardActivity extends AppCompatActivity { } }); - uiBinding.importImage.setOnClickListener(v -> launchImagePicker()); + uiBinding.importImage.setOnClickListener(v -> { + AdManager.showTopOn(this, new onActionListener() { + @Override + public void onAction() { + launchImagePicker(); + } + }); + }); uiBinding.light.setOnClickListener(v -> switchFlash()); - uiBinding.back.setOnClickListener(v -> finish()); + uiBinding.back.setOnClickListener(v -> { + AdManager.showTopOn(this, new onActionListener() { + @Override + public void onAction() { + finish(); + } + }); + }); uiBinding.reversal.setOnClickListener(v -> applyMirrorEffect()); - uiBinding.play.setOnClickListener(v -> capturePhoto()); + uiBinding.play.setOnClickListener(v -> { + AdManager.showTopOn(this, new onActionListener() { + @Override + public void onAction() { + capturePhoto(); + } + }); + }); } private void handleIntentImage() { diff --git a/app/src/main/java/com/ar/ardrawingboard/ui/activity/CategoryActivity.java b/app/src/main/java/com/ar/ardrawingboard/ui/activity/CategoryActivity.java index 5b7327b..c8f6287 100644 --- a/app/src/main/java/com/ar/ardrawingboard/ui/activity/CategoryActivity.java +++ b/app/src/main/java/com/ar/ardrawingboard/ui/activity/CategoryActivity.java @@ -6,6 +6,8 @@ import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.GridLayoutManager; +import com.ar.ardrawingboard.topon.AdManager; +import com.ar.ardrawingboard.topon.onActionListener; import com.ar.ardrawingboard.ui.adapter.FavoriteAndCategoryAdapter; import com.ar.ardrawingboard.databinding.ActivityCategoryBinding; import com.ar.ardrawingboard.room.AppDatabase; @@ -26,6 +28,14 @@ public class CategoryActivity extends AppCompatActivity { mBinding = ActivityCategoryBinding.inflate(getLayoutInflater()); setContentView(mBinding.getRoot()); + AdManager.loadAllAd(); + AdManager.showTopOn(this, new onActionListener() { + @Override + public void onAction() { + + } + }); + extractIntentData(); setupUI(); configureRecyclerView(); @@ -42,7 +52,12 @@ public class CategoryActivity extends AppCompatActivity { mBinding.title.setText(mCategoryTitle); mBinding.back.setOnClickListener(view -> { - finish(); + AdManager.showTopOn(this, new onActionListener() { + @Override + public void onAction() { + finish(); + } + }); }); } diff --git a/app/src/main/java/com/ar/ardrawingboard/ui/activity/MainActivity.java b/app/src/main/java/com/ar/ardrawingboard/ui/activity/MainActivity.java index 9791f0d..ae8e301 100644 --- a/app/src/main/java/com/ar/ardrawingboard/ui/activity/MainActivity.java +++ b/app/src/main/java/com/ar/ardrawingboard/ui/activity/MainActivity.java @@ -7,6 +7,7 @@ import android.view.View; import androidx.appcompat.app.AppCompatActivity; import com.ar.ardrawingboard.R; +import com.ar.ardrawingboard.topon.AdManager; import com.ar.ardrawingboard.ui.adapter.MainAdapter; import com.ar.ardrawingboard.databinding.ActivityMainBinding; import com.ar.ardrawingboard.databinding.MainTabItemCustomBinding; @@ -30,6 +31,8 @@ public class MainActivity extends AppCompatActivity { } private void configureViewPager() { + AdManager.loadAllAd(); + MainAdapter viewPagerAdapter = new MainAdapter(this); viewBinding.mainViewpager.setAdapter(viewPagerAdapter); } diff --git a/app/src/main/java/com/ar/ardrawingboard/ui/activity/SplashActivity.java b/app/src/main/java/com/ar/ardrawingboard/ui/activity/SplashActivity.java index 7070a52..1d318c0 100644 --- a/app/src/main/java/com/ar/ardrawingboard/ui/activity/SplashActivity.java +++ b/app/src/main/java/com/ar/ardrawingboard/ui/activity/SplashActivity.java @@ -9,13 +9,14 @@ import androidx.appcompat.app.AppCompatActivity; import com.ar.ardrawingboard.R; import com.ar.ardrawingboard.databinding.ActivitySplashBinding; +import com.ar.ardrawingboard.topon.AdManager; import com.bumptech.glide.Glide; import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; public class SplashActivity extends AppCompatActivity { private ActivitySplashBinding binding; - private static final long totalTime = 1000; + private static final long totalTime = 11000; private CountDownTimer countDownTimer; @Override @@ -25,6 +26,9 @@ public class SplashActivity extends AppCompatActivity { binding = ActivitySplashBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); + AdManager.loadAllAd(); + AdManager.setAlreadyShow(); + Glide.with(this) .load(R.mipmap.ic_launcher) .transform(new CenterCrop(),new RoundedCorners(32)) @@ -32,18 +36,12 @@ public class SplashActivity extends AppCompatActivity { .error(R.mipmap.placeholder) .into(binding.splashImage); - countDownTimer = new CountDownTimer(totalTime,100) { - @Override - public void onTick(long millisUntilFinished) { - int percentage = (int) (100 - (float) millisUntilFinished / totalTime * 100); - binding.progressBar.setProgress(percentage); - } - - @Override - public void onFinish() { - startMain(); - } - }; + countDownTimer = AdManager.showWelcomeAd(this, totalTime, millisUntilFinished -> { + int percentage = (int) (100 - (float) millisUntilFinished / totalTime * 100); + binding.progressBar.setProgress(percentage); + }, + this::startMain + ); countDownTimer.start(); } 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/gradle.properties b/gradle.properties index 4387edc..20b22f5 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. For more details, visit # https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2019aea..15a84c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.9.1" +agp = "8.10.0" junit = "4.13.2" junitVersion = "1.2.1" espressoCore = "3.6.1" diff --git a/settings.gradle.kts b/settings.gradle.kts index 29c56ba..ff6d68f 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") } }