diff --git a/.safedk/api/SafeDKAndroid-6.4.6.jar b/.safedk/api/SafeDKAndroid-6.4.6.jar new file mode 100644 index 0000000..bc81b11 Binary files /dev/null and b/.safedk/api/SafeDKAndroid-6.4.6.jar differ diff --git a/.safedk/dex/SafeDKAndroid-6.4.4.dex b/.safedk/dex/SafeDKAndroid-6.4.4.dex deleted file mode 100644 index 8282a92..0000000 Binary files a/.safedk/dex/SafeDKAndroid-6.4.4.dex and /dev/null differ diff --git a/.safedk/dex/SafeDKAndroid-6.4.6.dex b/.safedk/dex/SafeDKAndroid-6.4.6.dex new file mode 100644 index 0000000..041527f Binary files /dev/null and b/.safedk/dex/SafeDKAndroid-6.4.6.dex differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7ac79f0..df543fb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,11 +5,8 @@ plugins { id("org.jetbrains.kotlin.android") id("com.google.gms.google-services") id("com.google.firebase.crashlytics") - id("applovin-quality-service") -} -applovin{ - apiKey = "QSHbR4fRiQsQS35GZQfoxKJ9qpWcpR3DgvLcRdgJaN3OWFBLouEs6hfZqh0FpC5thnqdRfMvZGFfDc5Vekvicw" } + val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { namespace = "com.example.wallpapermagazine" @@ -17,11 +14,11 @@ android { defaultConfig { //com.wallpaper.magazine - applicationId = "com.wallpaper.magazine" + applicationId = "com.wallpaper.magazine.test" minSdk = 23 targetSdk = 34 - versionCode = 4 - versionName = "1.0.3" + versionCode = 5 + versionName = "1.0.4" setProperty( "archivesBaseName", "Wallpaper MagaZine_HD WallArt" + versionName + "(${versionCode})_$timestamp" @@ -67,16 +64,14 @@ dependencies { implementation ("androidx.room:room-runtime:2.4.0") annotationProcessor ("androidx.room:room-compiler:2.4.0") + implementation ("com.squareup.okhttp3:okhttp:3.14.7") + //----------------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.applovin:applovin-sdk:+") - implementation("com.applovin.mediation:vungle-adapter:+") - implementation("com.applovin.mediation:mintegral-adapter:+") - implementation("com.applovin.mediation:bytedance-adapter:+") - implementation("com.applovin.mediation:unityads-adapter:+") + } \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json index 5b0da64..9f241f0 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:531313760053:android:ae42b8b67d7c64708ede7c", "android_client_info": { - "package_name": "com.wallpaper.magazine" + "package_name": "com.wallpaper.magazine.test" } }, "oauth_client": [], diff --git a/app/src/main/java/com/example/wallpapermagazine/CataItemActivity.java b/app/src/main/java/com/example/wallpapermagazine/CataItemActivity.java index 7a57469..bf081c1 100644 --- a/app/src/main/java/com/example/wallpapermagazine/CataItemActivity.java +++ b/app/src/main/java/com/example/wallpapermagazine/CataItemActivity.java @@ -2,7 +2,6 @@ package com.example.wallpapermagazine; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.view.Window; import android.view.WindowManager; @@ -15,15 +14,9 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.example.wallpapermagazine.action.InfoListWallPaperListener; -import com.example.wallpapermagazine.action.InfoWallPaperListener; -import com.example.wallpapermagazine.json.Info; -import com.example.wallpapermagazine.max.MaxManager; -import com.example.wallpapermagazine.max.onActionListener; -import com.example.wallpapermagazine.max.onAdStatusListener; +import com.example.wallpapermagazine.action.onActionListener; import com.example.wallpapermagazine.recylcle.CataItemAdapter; -import java.util.List; - public class CataItemActivity extends AppCompatActivity implements InfoListWallPaperListener{ private RecyclerView recyclerView; @@ -83,15 +76,10 @@ public class CataItemActivity extends AppCompatActivity implements InfoListWallP findViewById(R.id.recycler_cata_item).setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); } private void showMax(onActionListener listener) { - MaxManager.ShowAd(CataItemActivity.this, new onAdStatusListener() { - @Override - public void onAdStatus(int type) { - if (type == MaxManager.type_show_close || type == MaxManager.type_show_fail || type == MaxManager.type_no_cache) { - if (listener != null) - listener.onAction(); - } - } - }); + if (listener != null) + listener.onAction(); + + // TODO: 2024/9/23 } @Override diff --git a/app/src/main/java/com/example/wallpapermagazine/DealData.kt b/app/src/main/java/com/example/wallpapermagazine/DealData.kt index 82b2cc9..a6fd521 100644 --- a/app/src/main/java/com/example/wallpapermagazine/DealData.kt +++ b/app/src/main/java/com/example/wallpapermagazine/DealData.kt @@ -4,30 +4,17 @@ import android.content.ContentValues import android.content.Context import android.content.Intent import android.graphics.Bitmap -import android.graphics.drawable.BitmapDrawable import android.net.Uri import android.os.Build import android.provider.MediaStore import android.util.Log -import android.widget.Toast - -import okhttp3.Call -import okhttp3.Callback -import okhttp3.OkHttpClient -import okhttp3.Request -import okhttp3.Response -import org.json.JSONArray -import java.io.BufferedReader import java.io.ByteArrayOutputStream import java.io.File import java.io.FileInputStream import java.io.FileOutputStream import java.io.IOException import java.io.InputStream -import java.io.InputStreamReader import java.io.OutputStream -import java.io.StringWriter -import java.nio.charset.StandardCharsets object DealData { @@ -35,30 +22,30 @@ object DealData { - fun downloadFile( - url: String, - savePath: String, - result: (Boolean, input: InputStream?) -> Unit - ) { - var client = OkHttpClient() - var request = Request.Builder().url(url).build() - var call = client.newCall(request) - call.enqueue(object : Callback { - override fun onFailure(call: Call, e: IOException) { - result.invoke(false, null) - } - - override fun onResponse(call: Call, response: Response) { - response.body?.run { - val byteStream = byteStream() - val writeFile = writeFile(byteStream, savePath) - result.invoke(writeFile, byteStream) - } ?: run { - result.invoke(false, null) - } - } - }) - } +// fun downloadFile( +// url: String, +// savePath: String, +// result: (Boolean, input: InputStream?) -> Unit +// ) { +// var client = OkHttpClient() +// var request = Request.Builder().url(url).build() +// var call = client.newCall(request) +// call.enqueue(object : Callback { +// override fun onFailure(call: Call, e: IOException) { +// result.invoke(false, null) +// } +// +// override fun onResponse(call: Call, response: Response) { +// response.body?.run { +// val byteStream = byteStream() +// val writeFile = writeFile(byteStream, savePath) +// result.invoke(writeFile, byteStream) +// } ?: run { +// result.invoke(false, null) +// } +// } +// }) +// } fun writeFile(input: InputStream, filePath: String): Boolean { try { diff --git a/app/src/main/java/com/example/wallpapermagazine/LogInActivity.java b/app/src/main/java/com/example/wallpapermagazine/LogInActivity.java index 7073122..8faa454 100644 --- a/app/src/main/java/com/example/wallpapermagazine/LogInActivity.java +++ b/app/src/main/java/com/example/wallpapermagazine/LogInActivity.java @@ -3,20 +3,12 @@ package com.example.wallpapermagazine; import android.content.Intent; import android.os.Bundle; import android.os.CountDownTimer; -import android.util.Log; import android.view.View; import android.view.Window; import android.view.WindowManager; import androidx.appcompat.app.AppCompatActivity; -import com.example.wallpapermagazine.max.MaxManager; -import com.example.wallpapermagazine.max.WelComManager; - -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function1; - public class LogInActivity extends AppCompatActivity { private CountDownTimer countDownTimer; @@ -31,25 +23,9 @@ public class LogInActivity extends AppCompatActivity { progressBar = findViewById(R.id.pb); inint(); - countDownTimer = WelComManager.initTimer(LogInActivity.this, time, new Function1() { - @Override - public Unit invoke(Long aLong) { - long number = time - aLong; - Double s = calculatePercentage(number, time); - Log.d(WallPaperSelect.TAG, "--------------l=" + s); - progressBar.setProgress(s.floatValue()); - return null; - } - }, new Function0() { - @Override - public Unit invoke() { - progressBar.setProgress(100); - Intent intent = new Intent(LogInActivity.this, MainActivity.class); - startActivity(intent); - finish(); - return null; - } - }); + Intent intent = new Intent(LogInActivity.this, MainActivity.class); + startActivity(intent); + finish(); } diff --git a/app/src/main/java/com/example/wallpapermagazine/ViewActivity.java b/app/src/main/java/com/example/wallpapermagazine/ViewActivity.java index 03a92fe..3beffff 100644 --- a/app/src/main/java/com/example/wallpapermagazine/ViewActivity.java +++ b/app/src/main/java/com/example/wallpapermagazine/ViewActivity.java @@ -2,18 +2,15 @@ package com.example.wallpapermagazine; import android.annotation.SuppressLint; import android.app.WallpaperManager; -import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.view.Window; import android.view.WindowManager; import android.widget.FrameLayout; -import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; @@ -31,16 +28,12 @@ import com.example.wallpapermagazine.LoveDAO.AppDatabase; import com.example.wallpapermagazine.LoveDAO.FavoriteImage; import com.example.wallpapermagazine.LoveDAO.FavoriteImageDao; import com.example.wallpapermagazine.action.DownloadListener; +import com.example.wallpapermagazine.action.onActionListener; import com.example.wallpapermagazine.donwload.ImageDownloadTask; import com.example.wallpapermagazine.fragment.PreviewFragment2; import com.example.wallpapermagazine.json.Info; -import com.example.wallpapermagazine.max.MaxManager; -import com.example.wallpapermagazine.max.onActionListener; -import com.example.wallpapermagazine.max.onAdStatusListener; -import com.example.wallpapermagazine.recylcle.FavoriteImageAdapter; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -62,7 +55,8 @@ public class ViewActivity extends AppCompatActivity { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.view_layout); - MaxManager.onLoadAd(); +// MaxManager.onLoadAd(); + // TODO: 2024/9/23 Ad inint(); nameop = getIntent().getIntExtra("naop", 2); recop = getIntent().getIntExtra("dataop", 16); @@ -281,14 +275,10 @@ public class ViewActivity extends AppCompatActivity { } private void showMax(onActionListener listener) { - MaxManager.ShowAd(ViewActivity.this, new onAdStatusListener() { - @Override - public void onAdStatus(int type) { - if (type == MaxManager.type_show_close || type == MaxManager.type_show_fail || type == MaxManager.type_no_cache) { - if (listener != null) - listener.onAction(); - } - } - }); + // TODO: 2024/9/23 Ad + + if (listener != null) + listener.onAction(); + } } diff --git a/app/src/main/java/com/example/wallpapermagazine/ViewActivity2.java b/app/src/main/java/com/example/wallpapermagazine/ViewActivity2.java index f3e4207..c3fc287 100644 --- a/app/src/main/java/com/example/wallpapermagazine/ViewActivity2.java +++ b/app/src/main/java/com/example/wallpapermagazine/ViewActivity2.java @@ -1,15 +1,11 @@ package com.example.wallpapermagazine; -import android.Manifest; import android.annotation.SuppressLint; import android.app.WallpaperManager; import android.content.Intent; -import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; -import android.os.AsyncTask; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.view.Window; import android.view.WindowManager; @@ -20,8 +16,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentStatePagerAdapter; import androidx.viewpager.widget.ViewPager; @@ -33,17 +27,12 @@ import com.example.wallpapermagazine.LoveDAO.AppDatabase; import com.example.wallpapermagazine.LoveDAO.FavoriteImage; import com.example.wallpapermagazine.LoveDAO.FavoriteImageDao; import com.example.wallpapermagazine.action.DownloadListener; +import com.example.wallpapermagazine.action.onActionListener; import com.example.wallpapermagazine.donwload.ImageDownloadTask; -import com.example.wallpapermagazine.fragment.FragmentLike; import com.example.wallpapermagazine.fragment.PreviewFragment; -import com.example.wallpapermagazine.json.Info; -import com.example.wallpapermagazine.max.MaxManager; -import com.example.wallpapermagazine.max.onActionListener; -import com.example.wallpapermagazine.max.onAdStatusListener; import com.example.wallpapermagazine.recylcle.FavoriteImageAdapter; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -66,7 +55,8 @@ public class ViewActivity2 extends AppCompatActivity { protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.viewlayout2); - MaxManager.onLoadAd(); +// MaxManager.onLoadAd(); + // TODO: 2024/9/23 Ad inint(); favoriteImage = new FavoriteImage(); appDatabase = AppDatabase.getDatabase(this); @@ -237,15 +227,12 @@ public class ViewActivity2 extends AppCompatActivity { }); } private void showMax(onActionListener listener) { - MaxManager.ShowAd(ViewActivity2.this, new onAdStatusListener() { - @Override - public void onAdStatus(int type) { - if (type == MaxManager.type_show_close || type == MaxManager.type_show_fail || type == MaxManager.type_no_cache) { - if (listener != null) - listener.onAction(); - } - } - }); + + // TODO: 2024/9/23 Ad + + if (listener != null) + listener.onAction(); + } private void inint() { diff --git a/app/src/main/java/com/example/wallpapermagazine/WallPaperSelect.java b/app/src/main/java/com/example/wallpapermagazine/WallPaperSelect.java index 0307483..255e2ab 100644 --- a/app/src/main/java/com/example/wallpapermagazine/WallPaperSelect.java +++ b/app/src/main/java/com/example/wallpapermagazine/WallPaperSelect.java @@ -1,17 +1,8 @@ package com.example.wallpapermagazine; -import static androidx.core.content.ContentProviderCompat.requireContext; - import android.app.Application; import android.content.Context; -import android.content.Intent; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - -import com.applovin.sdk.AppLovinMediationProvider; -import com.applovin.sdk.AppLovinSdk; -import com.applovin.sdk.AppLovinSdkConfiguration; -import com.applovin.sdk.AppLovinSdkInitializationConfiguration; import com.example.wallpapermagazine.json.Info; import com.example.wallpapermagazine.json.Info_data; import com.google.gson.Gson; @@ -74,16 +65,6 @@ public class WallPaperSelect extends Application { private void initMAxSDk() { - AppLovinSdkInitializationConfiguration initConfig = AppLovinSdkInitializationConfiguration.builder(SDK_KEY, this) - .setMediationProvider(AppLovinMediationProvider.MAX) - .build(); - // Initialize the SDK with the configuration - AppLovinSdk.getInstance(this).initialize(initConfig, new AppLovinSdk.SdkInitializationListener() { - @Override - public void onSdkInitialized(AppLovinSdkConfiguration appLovinSdkConfiguration) { - initSDkOK = true; - LocalBroadcastManager.getInstance(WallPaperSelect.this).sendBroadcast(new Intent(initAction)); - } - }); + } } diff --git a/app/src/main/java/com/example/wallpapermagazine/max/onActionListener.java b/app/src/main/java/com/example/wallpapermagazine/action/onActionListener.java similarity index 57% rename from app/src/main/java/com/example/wallpapermagazine/max/onActionListener.java rename to app/src/main/java/com/example/wallpapermagazine/action/onActionListener.java index 7f8e7cc..ac3e58b 100644 --- a/app/src/main/java/com/example/wallpapermagazine/max/onActionListener.java +++ b/app/src/main/java/com/example/wallpapermagazine/action/onActionListener.java @@ -1,4 +1,4 @@ -package com.example.wallpapermagazine.max; +package com.example.wallpapermagazine.action; public interface onActionListener { diff --git a/app/src/main/java/com/example/wallpapermagazine/fragment/FragmentHome.java b/app/src/main/java/com/example/wallpapermagazine/fragment/FragmentHome.java index a5dd555..41e8704 100644 --- a/app/src/main/java/com/example/wallpapermagazine/fragment/FragmentHome.java +++ b/app/src/main/java/com/example/wallpapermagazine/fragment/FragmentHome.java @@ -1,7 +1,5 @@ package com.example.wallpapermagazine.fragment; -import static com.unity3d.services.core.properties.SdkProperties.getVersionName; - import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -10,13 +8,11 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; - import android.widget.TextView; import androidx.annotation.NonNull; @@ -30,7 +26,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.example.wallpapermagazine.MainActivity; import com.example.wallpapermagazine.PvPoActivity; import com.example.wallpapermagazine.R; import com.example.wallpapermagazine.ReadFile; @@ -39,11 +34,8 @@ import com.example.wallpapermagazine.ViewActivity; import com.example.wallpapermagazine.WallPaperSelect; import com.example.wallpapermagazine.action.InfoListWallPaperListener; import com.example.wallpapermagazine.recylcle.RecommonedAdapter; -import com.example.wallpapermagazine.recylcle.SeeAllActivity; import com.google.android.material.navigation.NavigationView; -import java.util.Collections; -import java.util.Objects; import java.util.Random; public class FragmentHome extends Fragment implements InfoListWallPaperListener { @@ -183,13 +175,13 @@ public class FragmentHome extends Fragment implements InfoListWallPaperListener gridLayoutManager.setOrientation(RecyclerView.HORIZONTAL); recyclerView.setLayoutManager(gridLayoutManager); recyclerView.addItemDecoration(recycle_View); - RecommonedAdapter recommonedAdapter = new RecommonedAdapter(WallPaperSelect.getCataName(), getContext(), rand); + RecommonedAdapter recommonedAdapter = new RecommonedAdapter(WallPaperSelect.getCataName(), requireContext(), rand); recommonedAdapter.setInfoWallPaperListener((InfoListWallPaperListener) this); recyclerView.setAdapter(recommonedAdapter); } private void showDialog() { - AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); LayoutInflater inflater = getLayoutInflater(); View dialogView = inflater.inflate(R.layout.alterdialog, null); builder.setCustomTitle(dialogView); diff --git a/app/src/main/java/com/example/wallpapermagazine/fragment/FragmentLike.java b/app/src/main/java/com/example/wallpapermagazine/fragment/FragmentLike.java index 82ef6dc..fc942c9 100644 --- a/app/src/main/java/com/example/wallpapermagazine/fragment/FragmentLike.java +++ b/app/src/main/java/com/example/wallpapermagazine/fragment/FragmentLike.java @@ -1,5 +1,4 @@ package com.example.wallpapermagazine.fragment; -import static com.unity3d.services.core.properties.SdkProperties.getVersionName; import android.annotation.SuppressLint; import android.app.AlertDialog; @@ -15,6 +14,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.GravityCompat; @@ -22,6 +22,7 @@ import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import com.example.wallpapermagazine.LoveDAO.AppDatabase; import com.example.wallpapermagazine.LoveDAO.FavoriteImage; import com.example.wallpapermagazine.PvPoActivity; @@ -31,6 +32,7 @@ import com.example.wallpapermagazine.ViewActivity2; import com.example.wallpapermagazine.action.FavoriteLimage; import com.example.wallpapermagazine.recylcle.FavoriteImageAdapter; import com.google.android.material.navigation.NavigationView; + import java.util.ArrayList; import java.util.List; @@ -105,7 +107,7 @@ public class FragmentLike extends Fragment implements FavoriteLimage { recyclerView.setAdapter(adapter); } private void showDialog() { - AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); LayoutInflater inflater = getLayoutInflater(); View dialogView = inflater.inflate(R.layout.alterdialog, null); builder.setCustomTitle(dialogView); diff --git a/app/src/main/java/com/example/wallpapermagazine/max/MaxListener.java b/app/src/main/java/com/example/wallpapermagazine/max/MaxListener.java deleted file mode 100644 index a77ce26..0000000 --- a/app/src/main/java/com/example/wallpapermagazine/max/MaxListener.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.wallpapermagazine.max; - -import com.applovin.mediation.MaxAd; - -public interface MaxListener { - void onFail(MaxAd ad); - - void onShowSuccess(MaxAd ad); - - void onHidden(); -} diff --git a/app/src/main/java/com/example/wallpapermagazine/max/MaxManager.java b/app/src/main/java/com/example/wallpapermagazine/max/MaxManager.java deleted file mode 100644 index e762cd6..0000000 --- a/app/src/main/java/com/example/wallpapermagazine/max/MaxManager.java +++ /dev/null @@ -1,165 +0,0 @@ -package com.example.wallpapermagazine.max; - -import android.app.Activity; -import android.util.Log; - -import androidx.annotation.NonNull; - -import com.applovin.mediation.MaxAd; -import com.applovin.mediation.MaxAdListener; -import com.applovin.mediation.MaxError; -import com.applovin.mediation.ads.MaxInterstitialAd; -import com.example.wallpapermagazine.WallPaperSelect; - - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class MaxManager { - /** - * 858b17df7371e4cd - * 858b17df7371e4cd - * 9bc40a5042b29b1e - */ - private static final String one_AD = "858b17df7371e4cd"; - private static final String two_Ad = "858b17df7371e4cd"; - private static final String three_ad = "9bc40a5042b29b1e"; - - - public static final int type_no_cache = 0; - public static final int type_has_cache = 1; - public static final int type_show_success = 2; - public static final int type_show_close = 3; - public static final int type_show_fail = 4; - - private static List adList = new ArrayList<>(); - - public static MaxInterstitialAd getAd(List list) { - Collections.shuffle(list); - for (MaxInterstitialAd ad : list) { - if (ad.isReady()) { - return ad; - } - } - return null; - } - - public static List onLoadAd() { - if (adList.isEmpty()) { - MaxInterstitialAd AdT = new MaxInterstitialAd(two_Ad, WallPaperSelect.context); - MaxInterstitialAd AdOne = new MaxInterstitialAd(one_AD, WallPaperSelect.context); - MaxInterstitialAd AdThree = new MaxInterstitialAd(three_ad, WallPaperSelect.context); - adList.add(AdOne); - adList.add(AdT); - adList.add(AdThree); - } - - for (MaxInterstitialAd ad : adList) { - if (!ad.isReady()) { - setMyListener(ad, new MaxListener() { - @Override - public void onFail(MaxAd ad) { - - } - - @Override - public void onShowSuccess(MaxAd ad) { - - } - - @Override - public void onHidden() { - - } - }); - ad.loadAd(); - } - - } - - return adList; - } - - public static void setMyListener(MaxInterstitialAd ad, MaxListener maxListener) { - ad.setListener(new MaxAdListener() { - @Override - public void onAdLoaded(@NonNull MaxAd maxAd) { - Log.d(WallPaperSelect.TAG, "-------onAdLoaded-----maxAd="+maxAd.getAdUnitId()); - } - - @Override - public void onAdDisplayed(@NonNull MaxAd maxAd) { - Log.d(WallPaperSelect.TAG, "-------onAdDisplayed-----maxAd="+maxAd.getAdUnitId()); - maxListener.onShowSuccess(maxAd); - } - - @Override - public void onAdHidden(@NonNull MaxAd maxAd) { - Log.d(WallPaperSelect.TAG, "-------onAdHidden-----maxAd="+maxAd.getAdUnitId()); - maxListener.onHidden(); - setMyListener(ad, new MaxListener() { - @Override - public void onFail(MaxAd ad) { - - } - - @Override - public void onShowSuccess(MaxAd ad) { - - } - - @Override - public void onHidden() { - - } - }); - ad.loadAd(); - } - - @Override - public void onAdClicked(@NonNull MaxAd maxAd) { - - } - - @Override - public void onAdLoadFailed(@NonNull String s, @NonNull MaxError maxError) { - - } - - @Override - public void onAdDisplayFailed(@NonNull MaxAd maxAd, @NonNull MaxError maxError) { - maxListener.onFail(maxAd); - } - }); - - } - - public static void ShowAd(Activity activity, onAdStatusListener listener) { - MaxInterstitialAd ad = MaxManager.getAd(adList); - if (ad == null) { - listener.onAdStatus(type_no_cache); - } else { - listener.onAdStatus(type_has_cache); - MaxManager.setMyListener(ad, new MaxListener() { - @Override - public void onFail(MaxAd ad) { - listener.onAdStatus(type_show_fail); - } - - @Override - public void onShowSuccess(MaxAd ad) { - listener.onAdStatus(type_show_success); - } - - @Override - public void onHidden() { - listener.onAdStatus(type_show_close); - } - }); - ad.showAd(activity); - } - } - - -} diff --git a/app/src/main/java/com/example/wallpapermagazine/max/WelComManager.kt b/app/src/main/java/com/example/wallpapermagazine/max/WelComManager.kt deleted file mode 100644 index 4b54d8a..0000000 --- a/app/src/main/java/com/example/wallpapermagazine/max/WelComManager.kt +++ /dev/null @@ -1,81 +0,0 @@ -package com.example.wallpapermagazine.max - -import android.app.Activity -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent -import android.content.IntentFilter -import android.os.CountDownTimer -import android.util.Log -import androidx.localbroadcastmanager.content.LocalBroadcastManager -import com.applovin.mediation.ads.MaxInterstitialAd -import com.example.wallpapermagazine.WallPaperSelect - - -object WelComManager { - - private lateinit var timer: CountDownTimer - - private var need_Show = true - - private lateinit var lists: List - - @JvmStatic - fun initTimer( - activity: Activity, - countTime: Long, - timAction: (time: Long) -> Unit, - goMainAction: () -> Unit - ): CountDownTimer { - need_Show = true - timer = object : CountDownTimer(countTime, 100) { - override fun onTick(millisUntilFinished: Long) { - timAction.invoke(millisUntilFinished) - if (need_Show) { - MaxManager.ShowAd(activity) { - Log.d(WallPaperSelect.TAG, "--onTick----------it=$it") - if (it == MaxManager.type_has_cache) { - need_Show = false - } - if (it == MaxManager.type_show_close || it == MaxManager.type_show_fail) { - Log.d(WallPaperSelect.TAG, "--onTick---------enter") - goMainAction.invoke() - } - } - } - } - - override fun onFinish() { - if (need_Show) { - MaxManager.ShowAd(activity) { - if (it == MaxManager.type_show_close || it == MaxManager.type_show_fail || it == MaxManager.type_no_cache) { - Log.d(WallPaperSelect.TAG, "--onFinish---------enter") - goMainAction.invoke() - } - } - } - } - } - startAd(activity) - return timer - } - - private fun startAd(activity: Activity) { - if (!WallPaperSelect.initSDkOK) { - LocalBroadcastManager.getInstance(activity) - .registerReceiver(object : BroadcastReceiver() { - override fun onReceive(context: Context?, intent: Intent?) { - lists = MaxManager.onLoadAd() - timer.start() - Log.d(WallPaperSelect.TAG, "------------1sucess") - } - }, IntentFilter(WallPaperSelect.initAction)) - } else { - lists = MaxManager.onLoadAd() - timer.start() - Log.d(WallPaperSelect.TAG, "------------2sucess") - } - } - - -} \ No newline at end of file diff --git a/app/src/main/java/com/example/wallpapermagazine/max/onAdStatusListener.java b/app/src/main/java/com/example/wallpapermagazine/max/onAdStatusListener.java deleted file mode 100644 index cf8ef7d..0000000 --- a/app/src/main/java/com/example/wallpapermagazine/max/onAdStatusListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.wallpapermagazine.max; - -public interface onAdStatusListener { - - void onAdStatus(int type); -} diff --git a/build.gradle.kts b/build.gradle.kts index 0020323..4c8694d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,8 +5,3 @@ plugins { id("com.google.gms.google-services") version "4.3.15" apply false id ("com.google.firebase.crashlytics") version "2.9.2" apply false } -buildscript { - dependencies { - classpath("com.applovin.quality:AppLovinQualityServiceGradlePlugin:+") - } -} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index a28731d..8f44ab4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,7 +9,7 @@ pluginManagement { } mavenCentral() gradlePluginPortal() - maven { url = uri("https://artifacts.applovin.com/android") } + } } dependencyResolutionManagement { @@ -17,8 +17,7 @@ dependencyResolutionManagement { repositories { google() mavenCentral() - maven { url = uri("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") } - maven { url = uri("https://artifact.bytedance.com/repository/pangle") } + } }