diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b1a565d..f6c44e1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,8 +4,8 @@ import java.text.SimpleDateFormat plugins { id("com.android.application") id("org.jetbrains.kotlin.android") -// id("com.google.firebase.crashlytics") -// id("com.google.gms.google-services") + id("com.google.gms.google-services") + id("com.google.firebase.crashlytics") id("io.objectbox") } val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) @@ -18,8 +18,8 @@ android { applicationId = "com.ar.drawing.assistant.paint" minSdk = 23 targetSdk = 34 - versionCode = 1 - versionName = "1.0.0" + versionCode = 2 + versionName = "1.0.1" setProperty( "archivesBaseName", "AR Drawing Assistant_V" + versionName + "(${versionCode})_$timestamp" @@ -70,4 +70,105 @@ dependencies { implementation("androidx.camera:camera-view:${camerax_version}") //noinspection GradleDependency implementation("androidx.camera:camera-extensions:${camerax_version}") + + + + + implementation(platform("com.google.firebase:firebase-bom:33.7.0")) + implementation("com.google.firebase:firebase-crashlytics") + implementation("com.google.firebase:firebase-analytics") + implementation("com.google.firebase:firebase-config") + + + + + //-----------------------------------------------TopOn(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.0.7") + + //----------------------------------------------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..09817ea --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,29 @@ +{ + "project_info": { + "project_number": "178524111526", + "project_id": "ar-drawing-assistant", + "storage_bucket": "ar-drawing-assistant.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:178524111526:android:fcf323d0d9307c1c292a67", + "android_client_info": { + "package_name": "com.ar.drawing.assistant.paint" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyBKcKHSPpmdpMcFoXo_CS0i1cA9Pi402B8" + } + ], + "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 cf50408..e90305a 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,3 +20,131 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile +#---------------------------------------------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/drawing/assistant/paint/ad/AdListener.java b/app/src/main/java/com/ar/drawing/assistant/paint/ad/AdListener.java new file mode 100644 index 0000000..245fb8c --- /dev/null +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ad/AdListener.java @@ -0,0 +1,10 @@ +package com.ar.drawing.assistant.paint.ad; + +public interface AdListener { + void loadFail(String placeId); + void showSuccess(); + + void showFail(); + + void showClose(); +} diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/ad/AdManager.java b/app/src/main/java/com/ar/drawing/assistant/paint/ad/AdManager.java new file mode 100644 index 0000000..bebb705 --- /dev/null +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ad/AdManager.java @@ -0,0 +1,241 @@ +package com.ar.drawing.assistant.paint.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.ar.drawing.assistant.paint.utils.MyApp; + +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 = "n67d2b4297d98c"; + private static final String place2Id = "n67d2b40c714ac"; + private static final String place3Id = "n67d2b3ebb2adf"; + + + 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.size() == 0) { + ATInterstitial mInterstitialAd1 = new ATInterstitial(MyApp.app, place1Id); + ATInterstitial mInterstitialAd2 = new ATInterstitial(MyApp.app, place2Id); + ATInterstitial mInterstitialAd3 = new ATInterstitial(MyApp.app, 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(MyApp.TAG, "-has Cache------------"); + return ad; + } + } + Log.d(MyApp.TAG, "-No Cache------------"); + return null; + } + + private static void setCallBack(ATInterstitial ad, AdListener listener) { + ad.setAdListener(new ATInterstitialListener() { + + + @Override + public void onInterstitialAdLoaded() { + Log.d(MyApp.TAG, "LoadLoaded " + ad.mPlacementId); + } + + @Override + public void onInterstitialAdLoadFail(AdError adError) { + listener.loadFail(ad.mPlacementId); + Log.d(MyApp.TAG, "LoadFail:--" + ad.mPlacementId + "--" + adError.getCode() + "---" + adError.getDesc()); + } + + @Override + public void onInterstitialAdClicked(ATAdInfo atAdInfo) { + + } + + @Override + public void onInterstitialAdShow(ATAdInfo atAdInfo) { + Log.d(MyApp.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(MyApp.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 (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/drawing/assistant/paint/ad/AdStatusAction.java b/app/src/main/java/com/ar/drawing/assistant/paint/ad/AdStatusAction.java new file mode 100644 index 0000000..3bb5046 --- /dev/null +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ad/AdStatusAction.java @@ -0,0 +1,5 @@ +package com.ar.drawing.assistant.paint.ad; + +public interface AdStatusAction { + void onStatus(int adType); +} diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/ad/CountAction.java b/app/src/main/java/com/ar/drawing/assistant/paint/ad/CountAction.java new file mode 100644 index 0000000..fa0fa40 --- /dev/null +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ad/CountAction.java @@ -0,0 +1,5 @@ +package com.ar.drawing.assistant.paint.ad; + +public interface CountAction { + void onCount(long millisUntilFinished); +} diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/ad/GoMainAction.java b/app/src/main/java/com/ar/drawing/assistant/paint/ad/GoMainAction.java new file mode 100644 index 0000000..0666c74 --- /dev/null +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ad/GoMainAction.java @@ -0,0 +1,5 @@ +package com.ar.drawing.assistant.paint.ad; + +public interface GoMainAction { + void onGo(); +} diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/ad/onActionListener.java b/app/src/main/java/com/ar/drawing/assistant/paint/ad/onActionListener.java new file mode 100644 index 0000000..eb05e8a --- /dev/null +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ad/onActionListener.java @@ -0,0 +1,6 @@ +package com.ar.drawing.assistant.paint.ad; + +public interface onActionListener { + + void onAction(); +} diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActList.java b/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActList.java index 5546ed0..50b1e86 100644 --- a/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActList.java +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActList.java @@ -6,6 +6,8 @@ import android.view.View; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.GridLayoutManager; +import com.ar.drawing.assistant.paint.ad.AdManager; +import com.ar.drawing.assistant.paint.ad.onActionListener; import com.ar.drawing.assistant.paint.databinding.ActItemBinding; import com.ar.drawing.assistant.paint.tooladapter.AdList; import com.ar.drawing.assistant.paint.utils.Common; @@ -31,7 +33,13 @@ public class ActList extends AppCompatActivity { dirStr = getIntent().getStringExtra(MyApp.Key_ViewDir); preViewBinding.categoryName.setText(dirStr.substring(dirStr.lastIndexOf("_") + 1)); + AdManager.loadAllAd(); + AdManager.showTopOn(ActList.this, new onActionListener() { + @Override + public void onAction() { + } + }); onInitList(); onInitClick(); @@ -51,7 +59,14 @@ public class ActList extends AppCompatActivity { preViewBinding.back.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - finish(); + + AdManager.showTopOn(ActList.this, new onActionListener() { + @Override + public void onAction() { + finish(); + } + }); + } }); } diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActMain.java b/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActMain.java index be86238..5dd9d1d 100644 --- a/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActMain.java +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActMain.java @@ -13,6 +13,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; import com.ar.drawing.assistant.paint.R; +import com.ar.drawing.assistant.paint.ad.AdManager; import com.ar.drawing.assistant.paint.databinding.ActHomeBinding; import com.ar.drawing.assistant.paint.ui_fragment.FragFavorite; import com.ar.drawing.assistant.paint.ui_fragment.FragHome; @@ -42,7 +43,7 @@ public class ActMain extends AppCompatActivity { listFragment.add(FragHome.newInstance()); listFragment.add(FragImport.newInstance()); listFragment.add(FragFavorite.newInstance()); - + AdManager.loadAllAd(); onTabInit(); binding.viewPager2.setUserInputEnabled(false); binding.viewPager2.setAdapter(new FragmentStateAdapter(this) { diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActPreview.java b/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActPreview.java index bf51e5a..b965612 100644 --- a/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActPreview.java +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActPreview.java @@ -31,6 +31,8 @@ import androidx.camera.view.PreviewView; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; +import com.ar.drawing.assistant.paint.ad.AdManager; +import com.ar.drawing.assistant.paint.ad.onActionListener; import com.ar.drawing.assistant.paint.tooldb.DbManager; import com.ar.drawing.assistant.paint.utils.Common; import com.google.common.util.concurrent.ListenableFuture; @@ -78,8 +80,13 @@ public class ActPreview extends AppCompatActivity implements View.OnTouchListene Common.setStatusBarTextColor(this, true); Intent intent = getIntent(); isMain = intent.getBooleanExtra(MyApp.Key_ISMAIN, false); + AdManager.loadAllAd(); + AdManager.showTopOn(ActPreview.this, new onActionListener() { + @Override + public void onAction() { - + } + }); previewView = findViewById(R.id.preview); imageView = findViewById(R.id.image); imBack = findViewById(R.id.back); @@ -216,8 +223,14 @@ public class ActPreview extends AppCompatActivity implements View.OnTouchListene flashIm.setSelected(!selected); camera.getCameraControl().enableTorch(!selected); } else if (v.equals(imPhoto)) { - Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); - intentActivityResultLauncher.launch(intent); + AdManager.showTopOn(ActPreview.this, new onActionListener() { + @Override + public void onAction() { + Intent intent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); + intentActivityResultLauncher.launch(intent); + } + }); + } else if (v.equals(imZoom)) { if (seekBar.getVisibility() == View.VISIBLE) { seekBar.setVisibility(View.GONE); diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActWelcome.java b/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActWelcome.java index 5276b2f..53af22f 100644 --- a/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActWelcome.java +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ui_activity/ActWelcome.java @@ -6,13 +6,16 @@ import android.os.CountDownTimer; import androidx.appcompat.app.AppCompatActivity; +import com.ar.drawing.assistant.paint.ad.AdManager; +import com.ar.drawing.assistant.paint.ad.CountAction; +import com.ar.drawing.assistant.paint.ad.GoMainAction; import com.ar.drawing.assistant.paint.databinding.ActWelcomeBinding; import com.ar.drawing.assistant.paint.utils.Common; public class ActWelcome extends AppCompatActivity { private ActWelcomeBinding binding; - private long time = 1000; + private long time = 11000; private CountDownTimer countDownTimer; @@ -23,21 +26,20 @@ public class ActWelcome extends AppCompatActivity { binding = ActWelcomeBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); Common.setStatusBarTextColor(this, true); - - - countDownTimer= new CountDownTimer(time,100) { + AdManager.loadAllAd(); + countDownTimer = AdManager.showWelcomeAd(ActWelcome.this, time, new CountAction() { @Override - public void onTick(long millisUntilFinished) { + public void onCount(long millisUntilFinished) { int progressPercentage = (int) ((100 * millisUntilFinished) / time); int Percentage = 100 - progressPercentage; binding.loadingPb.setProgress(Percentage); } - + }, new GoMainAction() { @Override - public void onFinish() { + public void onGo() { enterMain(); } - }; + }); countDownTimer.start(); } private void enterMain() { diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/ui_fragment/FragImport.java b/app/src/main/java/com/ar/drawing/assistant/paint/ui_fragment/FragImport.java index f02e327..41416d2 100644 --- a/app/src/main/java/com/ar/drawing/assistant/paint/ui_fragment/FragImport.java +++ b/app/src/main/java/com/ar/drawing/assistant/paint/ui_fragment/FragImport.java @@ -20,6 +20,8 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; import com.ar.drawing.assistant.paint.R; +import com.ar.drawing.assistant.paint.ad.AdManager; +import com.ar.drawing.assistant.paint.ad.onActionListener; import com.ar.drawing.assistant.paint.databinding.FragImportBinding; import com.ar.drawing.assistant.paint.tooladapter.AdImport; import com.ar.drawing.assistant.paint.tooldb.DbManager; @@ -71,7 +73,13 @@ public class FragImport extends Fragment { binding.btnImport.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - checkPermission(); + AdManager.showTopOn(requireActivity(), new onActionListener() { + @Override + public void onAction() { + checkPermission(); + } + }); + } }); diff --git a/app/src/main/java/com/ar/drawing/assistant/paint/utils/MyApp.java b/app/src/main/java/com/ar/drawing/assistant/paint/utils/MyApp.java index f9c1d9b..ea01e2f 100644 --- a/app/src/main/java/com/ar/drawing/assistant/paint/utils/MyApp.java +++ b/app/src/main/java/com/ar/drawing/assistant/paint/utils/MyApp.java @@ -4,6 +4,9 @@ import android.app.Application; import android.content.res.AssetManager; import android.graphics.Typeface; +import com.anythink.core.api.ATSDK; +import com.anythink.core.api.NetTrafficeCallback; +import com.ar.drawing.assistant.paint.ad.AdManager; import com.ar.drawing.assistant.paint.tooldb.DbManager; import java.util.ArrayList; @@ -32,30 +35,34 @@ public class MyApp extends Application { app = this; AssetManager assets = getAssets(); defaultFont = Typeface.createFromAsset(assets, "myfont.ttf"); - + initSDk(); DbManager.init(this); } -// private void initSDk(){ -// ATSDK.checkIsEuTraffic(this, new NetTrafficeCallback() { -// -// @Override -// public void onResultCallback(boolean isEU) { -// if (isEU && ATSDK.getGDPRDataLevel(MyApplication.this) == ATSDK.UNKNOWN) { -// ATSDK.showGdprAuth(MyApplication.this); -// } -// -// } -// -// @Override -// public void onErrorCallback(String errorMsg) { -// -// } -// }); -// ATSDK.init( this, APPId, AppKey); -// ; -// } + private void initSDk(){ + ATSDK.checkIsEuTraffic(this, new NetTrafficeCallback() { + + @Override + public void onResultCallback(boolean isEU) { + if (isEU && ATSDK.getGDPRDataLevel(MyApp.this) == ATSDK.UNKNOWN) { + ATSDK.showGdprAuth(MyApp.this); + } + + } + + @Override + public void onErrorCallback(String errorMsg) { + + } + }); + String APPId = "h67d2b184775c9"; + String AppKey = "aa03c7f638642c6e3621bdbfb88bf6ad5"; + ATSDK.init( this, APPId, AppKey); + ATSDK.setNetworkLogDebug(true); + AdManager.loadAllAd(); + + } public static String Class_Animals = "res_Animals"; public static String Class_birds = "res_Birds"; diff --git a/build.gradle.kts b/build.gradle.kts index ac9937f..67e61f5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,8 +2,8 @@ plugins { id("com.android.application") version "8.1.0" apply false id("org.jetbrains.kotlin.android") version "1.8.20" 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 + id("com.google.gms.google-services") version "4.4.2" apply false + id ("com.google.firebase.crashlytics") version "3.0.2" apply false } buildscript{ dependencies{ diff --git a/settings.gradle.kts b/settings.gradle.kts index 1c4aabb..24eedd1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -12,7 +12,27 @@ 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") }