diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index b3405b3..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -My Application \ No newline at end of file diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml deleted file mode 100644 index 4a53bee..0000000 --- a/.idea/AndroidProjectSystem.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index b86273d..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml deleted file mode 100644 index 3136fed..0000000 --- a/.idea/deploymentTargetSelector.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml deleted file mode 100644 index 91f9558..0000000 --- a/.idea/deviceManager.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 793e600..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml deleted file mode 100644 index f8051a6..0000000 --- a/.idea/migrations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index b2c751a..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 16660f1..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/test2/.gitignore b/app/.gitignore similarity index 100% rename from test2/.gitignore rename to app/.gitignore diff --git a/test2/WallpaperExquisite.jks b/app/WallpaperExquisite.jks similarity index 100% rename from test2/WallpaperExquisite.jks rename to app/WallpaperExquisite.jks diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..3ee9a37 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,138 @@ +import java.io.FileInputStream +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Properties + +plugins { + alias(libs.plugins.android.application) + id("com.google.gms.google-services") + id("com.google.firebase.crashlytics") +} +val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) +val keystorePropertiesFile = rootProject.file("keystore.properties") +val keystoreProperties = Properties().apply { + load(FileInputStream(keystorePropertiesFile)) +} +android { + namespace = "com.wall.exquisite.wallpaper" + compileSdk = 36 + + defaultConfig { + applicationId = "com.wall.exquisite.wallpaper" + minSdk = 24 + targetSdk = 36 + versionCode = 3 + versionName = "2.1" + setProperty("archivesBaseName","Wallpaper Exquisite_v"+versionName+"(${versionCode})_$timestamp") + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + signingConfigs { + create("release") { + storeFile = file(keystoreProperties["keystoreFile"] as String) + storePassword = keystoreProperties["key_store_password"] as String + keyAlias = keystoreProperties["key_alias"] as String + keyPassword = keystoreProperties["key_password"] as String + } + } + + buildTypes { + release { + isMinifyEnabled = true + signingConfig = signingConfigs.getByName("release") + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + buildFeatures { + viewBinding = true + } +} + +dependencies { + implementation(libs.appcompat) + implementation(libs.material) + implementation("androidx.activity:activity:1.10.0") + implementation(libs.constraintlayout) + testImplementation(libs.junit) + androidTestImplementation(libs.ext.junit) + androidTestImplementation(libs.espresso.core) + + // 图片加载库 + implementation("com.github.bumptech.glide:glide:4.16.0") + annotationProcessor("com.github.bumptech.glide:compiler:4.16.0") + + // JSON解析 + implementation("com.google.code.gson:gson:2.10.1") + + // 其他UI组件 + implementation("androidx.viewpager2:viewpager2:1.0.0") + implementation("androidx.recyclerview:recyclerview:1.3.2") + // 图片缩放库（必加，否则无法缩放大图） +// implementation("com.github.chrisbanes:PhotoView:2.3.0") + + + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.appcompat:appcompat:1.6.1") + + // 新增：Glide Transform扩展（用于圆角变换） + implementation ("jp.wasabeef:glide-transformations:4.3.0") + + implementation ("androidx.constraintlayout:constraintlayout:2.1.4") + + implementation(files("libs/UpLoadLibrary_12_03_15_13-release.aar")) + implementation ("com.squareup.okhttp3:okhttp:4.12.0") + implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") + + implementation ("com.google.android.gms:play-services-ads-identifier:18.0.1") + + + //firebase + 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") + + + implementation(files("libs/IronSourceLibrary_01_07_18_13-release.aar")) + + //---------------------------ironSource + implementation("com.unity3d.ads-mediation:mediation-sdk:9.2.0") +// Add BIGO Ads Network + implementation("com.unity3d.ads-mediation:bigo-adapter:5.2.0") + implementation("com.bigossp:bigo-ads:5.6.2") +// Add Chartboost Network + implementation("com.unity3d.ads-mediation:chartboost-adapter:5.2.0") +// implementation("com.chartboost:chartboost-sdk:9.10.2") + + implementation("com.chartboost:chartboost-sdk:9.8.3") +// Add DT Exchange Network + implementation("com.unity3d.ads-mediation:fyber-adapter:5.2.0") + implementation("com.fyber:marketplace-sdk:8.4.1") +// Add InMobi Network + implementation("com.unity3d.ads-mediation:inmobi-adapter:5.3.0") + implementation("com.inmobi.monetization:inmobi-ads-kotlin:11.1.0") +// Add Liftoff Monetize Network + implementation("com.unity3d.ads-mediation:vungle-adapter:5.2.0") + implementation("com.vungle:vungle-ads:7.6.1") +// Add Mintegral Network + implementation("com.unity3d.ads-mediation:mintegral-adapter:5.3.0") + implementation("com.mbridge.msdk.oversea:mbridge_android_sdk:17.0.31") +// Add Moloco Network + implementation("com.unity3d.ads-mediation:moloco-adapter:5.5.0") + implementation("com.moloco.sdk:moloco-sdk:4.3.1") +// Add Pangle Network + implementation("com.unity3d.ads-mediation:pangle-adapter:5.4.0") + implementation("com.pangle.global:pag-sdk:7.8.0.7") +// Add Unity Ads Network + implementation("com.unity3d.ads-mediation:unityads-adapter:5.3.0") + implementation("com.unity3d.ads:unity-ads:4.16.4") +} \ No newline at end of file diff --git a/test2/google-services.json b/app/google-services.json similarity index 100% rename from test2/google-services.json rename to app/google-services.json diff --git a/app/libs/IronSourceLibrary_01_07_18_13-release.aar b/app/libs/IronSourceLibrary_01_07_18_13-release.aar new file mode 100644 index 0000000..97be64b Binary files /dev/null and b/app/libs/IronSourceLibrary_01_07_18_13-release.aar differ diff --git a/test2/libs/UpLoadLibrary_12_03_15_13-release.aar b/app/libs/UpLoadLibrary_12_03_15_13-release.aar similarity index 100% rename from test2/libs/UpLoadLibrary_12_03_15_13-release.aar rename to app/libs/UpLoadLibrary_12_03_15_13-release.aar diff --git a/test2/proguard-rules.pro b/app/proguard-rules.pro similarity index 100% rename from test2/proguard-rules.pro rename to app/proguard-rules.pro diff --git a/test2/src/androidTest/java/com/example/test2/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/test2/ExampleInstrumentedTest.java similarity index 100% rename from test2/src/androidTest/java/com/example/test2/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/example/test2/ExampleInstrumentedTest.java diff --git a/test2/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 92% rename from test2/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml index ea09d58..98604c7 100644 --- a/test2/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,10 +3,7 @@ - - + null); + ISAdManager.showIsAd(this, () -> { + + }); initViews(); setupRecyclerView(); loadFavoriteData(); @@ -65,10 +69,7 @@ public class CollectionActivity extends AppCompatActivity { rvFavoriteImages = findViewById(R.id.rv_favorite_images); tvEmpty = findViewById(R.id.tv_empty); - findViewById(R.id.btn_back).setOnClickListener(v -> TPAdManager.INSTANCE.showTPAD(this,()-> { - finish(); - return null; - })); + findViewById(R.id.btn_back).setOnClickListener(v -> ISAdManager.showIsAd(this, this::finish)); favoriteManager = new CollectionManager(this); favoriteList = new ArrayList<>(); diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/CollectionFragment.java b/app/src/main/java/com/wall/exquisite/wallpaper/CollectionFragment.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/CollectionFragment.java rename to app/src/main/java/com/wall/exquisite/wallpaper/CollectionFragment.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/CollectionManager.java b/app/src/main/java/com/wall/exquisite/wallpaper/CollectionManager.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/CollectionManager.java rename to app/src/main/java/com/wall/exquisite/wallpaper/CollectionManager.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/FirstMainActivity.java b/app/src/main/java/com/wall/exquisite/wallpaper/FirstMainActivity.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/FirstMainActivity.java rename to app/src/main/java/com/wall/exquisite/wallpaper/FirstMainActivity.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/FullImageActivity.java b/app/src/main/java/com/wall/exquisite/wallpaper/FullImageActivity.java similarity index 79% rename from test2/src/main/java/com/wall/exquisite/wallpaper/FullImageActivity.java rename to app/src/main/java/com/wall/exquisite/wallpaper/FullImageActivity.java index 400509e..8fd0bf5 100644 --- a/test2/src/main/java/com/wall/exquisite/wallpaper/FullImageActivity.java +++ b/app/src/main/java/com/wall/exquisite/wallpaper/FullImageActivity.java @@ -1,22 +1,20 @@ package com.wall.exquisite.wallpaper; import android.app.WallpaperManager; -import android.content.ContentValues; import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.drawable.Drawable; -import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.os.Environment; -import android.provider.MediaStore; import android.util.DisplayMetrics; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.Window; import android.view.WindowManager; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.Toast; @@ -27,7 +25,8 @@ import androidx.core.view.WindowCompat; import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsControllerCompat; -import com.ad.tradpluslibrary.TPAdManager; +import com.ad.ironsourcelibrary.ActionListener; +import com.ad.ironsourcelibrary.ISAdManager; import com.bumptech.glide.Glide; import com.bumptech.glide.RequestManager; import com.bumptech.glide.load.DataSource; @@ -37,8 +36,9 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; -import com.wall.exquisite.wallpaper.databinding.ActivityFullImageBinding; + +import com.wall.exquisite.wallpaper.databinding.ActivityFullImageBinding; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -47,11 +47,7 @@ import java.net.URL; import java.net.URLConnection; // 壁纸设置类型常量 -interface WallpaperType { - int TYPE_HOME = 1; // 桌面 - int TYPE_LOCK = 2; // 锁屏 - int TYPE_BOTH = 3; // 桌面+锁屏 -} + public class FullImageActivity extends AppCompatActivity implements WallpaperType { // 传递参数Key @@ -64,7 +60,7 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp private String imageId; private String imageDesc; private File tempFile; - private WallpaperManager wallpaperManager; + private CollectionManager favoriteManager; private int screenWidth; // 屏幕宽度 private int screenHeight; // 屏幕高度（包含状态栏/导航栏，适配全面屏） @@ -72,6 +68,7 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp private boolean isActivityDestroyed = false; // 标记Activity是否已销毁 private Thread downloadThread; // 下载线程引用（用于销毁时中断） private Thread setWallpaperThread; // 设置壁纸线程引用（用于销毁时中断） + private ImageView imageviewBack; @Override protected void onCreate(Bundle savedInstanceState) { @@ -79,6 +76,9 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp binding = ActivityFullImageBinding.inflate(getLayoutInflater()); setContentView(binding.getRoot()); + imageviewBack = findViewById(R.id.imageview_back); + ISAdManager.loadAllAd(); + // 1. 初始化Glide RequestManager，绑定Activity生命周期（避免内存泄漏） glideRequestManager = Glide.with(this); @@ -87,7 +87,7 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp // 获取屏幕尺寸（用于壁纸精准缩放） getScreenSize(); // 初始化管理器 - wallpaperManager = WallpaperManager.getInstance(this); + favoriteManager = new CollectionManager(this); // 获取传递的参数 @@ -98,6 +98,12 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp initClick(); // 初始化点赞状态 initFavoriteState(); + ISAdManager.showIsAd(this, new ActionListener() { + @Override + public void onAction() { + + } + }); } /** @@ -218,25 +224,13 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp */ private void initClick() { // 返回按钮（关闭当前页面） - binding.imageviewBack.setOnClickListener(v -> TPAdManager.INSTANCE.showTPAD(this,()-> { - finish(); - return null; - })); - - // 下载按钮（保存图片到相册，无需权限） - binding.layoutDownload.setOnClickListener(v -> TPAdManager.INSTANCE.showTPAD(this,()-> { - startDownload(); - return null; - })); + imageviewBack.setOnClickListener(v -> ISAdManager.showIsAd(this, this::finish)); // 设置壁纸按钮（弹出选择弹窗） - binding.buttonSet1.setOnClickListener(v -> showWallpaperTypeDialog()); + binding.buttonSet1.setOnClickListener(v -> ISAdManager.showIsAd(this, this::showWallpaperTypeDialog)); // 点赞按钮（收藏/取消收藏） - binding.imageFavorite.setOnClickListener(v -> TPAdManager.INSTANCE.showTPAD(this,()-> { - toggleFavorite(); - return null; - })); + binding.imageFavorite.setOnClickListener(v -> toggleFavorite()); } @@ -279,107 +273,6 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp } } - /** - * 下载图片到相册（通过MediaStore，无需存储权限） - */ - private void startDownload() { - // 显示加载进度条，隐藏下载按钮 - showLoading(binding.pbDownload, binding.imageDownload, true); - - // 保存线程引用，便于销毁时中断 - downloadThread = new Thread(() -> { - // 检查Activity是否已销毁，避免无效执行 - if (isActivityDestroyed) { - runOnUiThread(() -> showLoading(binding.pbDownload, binding.imageDownload, false)); - return; - } - - Bitmap bitmap = null; - try { - // 检查线程是否被中断（Activity销毁时触发） - if (Thread.currentThread().isInterrupted()) throw new InterruptedException(); - - // 1. 从网络下载图片 - URL url = new URL(imageUrl); - URLConnection conn = url.openConnection(); - InputStream is = conn.getInputStream(); - bitmap = BitmapFactory.decodeStream(is); - is.close(); - - // 检查图片是否解码成功 - if (bitmap == null) { - throw new IOException("Failed to decode image"); - } - - // 再次检查Activity状态和线程中断状态 - if (isActivityDestroyed || Thread.currentThread().isInterrupted()) { - throw new InterruptedException(); - } - - // 2. 通过MediaStore写入相册（Android 10+ 适配） - ContentValues values = new ContentValues(); - values.put(MediaStore.Images.Media.DISPLAY_NAME, imageId + ".jpg"); // 文件名 - values.put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg"); // 文件类型 - values.put(MediaStore.Images.Media.RELATIVE_PATH, Environment.DIRECTORY_DCIM + "/Wallpaper"); // 相册路径（DCIM/Wallpaper） - values.put(MediaStore.Images.Media.WIDTH, bitmap.getWidth()); - values.put(MediaStore.Images.Media.HEIGHT, bitmap.getHeight()); - - // Android 10+ 标记为待处理（避免相册立即扫描） - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - values.put(MediaStore.Images.Media.IS_PENDING, 1); - } - - // 插入到媒体库，获取图片Uri - Uri imageUri = getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values); - if (imageUri == null) { - throw new IOException("Failed to import to media library"); - } - - // 写入图片数据到Uri - try (OutputStream os = getContentResolver().openOutputStream(imageUri)) { - bitmap.compress(Bitmap.CompressFormat.JPEG, 100, os); - } - - // Android 10+ 标记为完成（允许相册扫描） - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - values.clear(); - values.put(MediaStore.Images.Media.IS_PENDING, 0); - getContentResolver().update(imageUri, values, null, null); - } - - // 保存临时文件（用于后续设置壁纸，无需重复下载） - saveTempFile(bitmap); - - // 主线程更新UI（下载成功） - if (!isActivityDestroyed && !Thread.currentThread().isInterrupted()) { - runOnUiThread(() -> { - showLoading(binding.pbDownload, binding.imageDownload, false); - Toast.makeText(this, "Download successful. Saved to your photo library", Toast.LENGTH_LONG).show(); - }); - } - - } catch (InterruptedException e) { - // 线程被中断（Activity销毁），直接退出，不提示错误 - Log.d("FullImage", "Download thread interrupted"); - runOnUiThread(() -> showLoading(binding.pbDownload, binding.imageDownload, false)); - } catch (Exception e) { - // 其他异常（下载失败） - e.printStackTrace(); - if (!isActivityDestroyed) { - runOnUiThread(() -> { - showLoading(binding.pbDownload, binding.imageDownload, false); - Toast.makeText(FullImageActivity.this, "Download failed：" + e.getMessage(), Toast.LENGTH_SHORT).show(); - }); - } - } finally { - // 回收Bitmap，避免内存泄漏 - if (bitmap != null && !bitmap.isRecycled()) { - bitmap.recycle(); - } - } - }); - downloadThread.start(); - } /** * 保存临时文件到应用私有目录（用于设置壁纸，无需权限） @@ -397,6 +290,7 @@ public class FullImageActivity extends AppCompatActivity implements WallpaperTyp * 显示壁纸设置类型弹窗（桌面/锁屏/两者） */ private void showWallpaperTypeDialog() { + ISAdManager.loadAllAd(); // 加载自定义弹窗布局 View dialogView = LayoutInflater.from(this).inflate(R.layout.dialog_wallpapertype, null); diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/HomePageFragment.java b/app/src/main/java/com/wall/exquisite/wallpaper/HomePageFragment.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/HomePageFragment.java rename to app/src/main/java/com/wall/exquisite/wallpaper/HomePageFragment.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/Inner_TabAdapter.java b/app/src/main/java/com/wall/exquisite/wallpaper/Inner_TabAdapter.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/Inner_TabAdapter.java rename to app/src/main/java/com/wall/exquisite/wallpaper/Inner_TabAdapter.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/JsonUtils.java b/app/src/main/java/com/wall/exquisite/wallpaper/JsonUtils.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/JsonUtils.java rename to app/src/main/java/com/wall/exquisite/wallpaper/JsonUtils.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/MyData.java b/app/src/main/java/com/wall/exquisite/wallpaper/MyData.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/MyData.java rename to app/src/main/java/com/wall/exquisite/wallpaper/MyData.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/NatureFragment.java b/app/src/main/java/com/wall/exquisite/wallpaper/NatureFragment.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/NatureFragment.java rename to app/src/main/java/com/wall/exquisite/wallpaper/NatureFragment.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/NatureImageAdapter.java b/app/src/main/java/com/wall/exquisite/wallpaper/NatureImageAdapter.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/NatureImageAdapter.java rename to app/src/main/java/com/wall/exquisite/wallpaper/NatureImageAdapter.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/Outer_TabAdapter.java b/app/src/main/java/com/wall/exquisite/wallpaper/Outer_TabAdapter.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/Outer_TabAdapter.java rename to app/src/main/java/com/wall/exquisite/wallpaper/Outer_TabAdapter.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/PatternsFragment.java b/app/src/main/java/com/wall/exquisite/wallpaper/PatternsFragment.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/PatternsFragment.java rename to app/src/main/java/com/wall/exquisite/wallpaper/PatternsFragment.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/PatternsImageAdapter.java b/app/src/main/java/com/wall/exquisite/wallpaper/PatternsImageAdapter.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/PatternsImageAdapter.java rename to app/src/main/java/com/wall/exquisite/wallpaper/PatternsImageAdapter.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/Setting_Fragment.java b/app/src/main/java/com/wall/exquisite/wallpaper/Setting_Fragment.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/Setting_Fragment.java rename to app/src/main/java/com/wall/exquisite/wallpaper/Setting_Fragment.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/StartuppageActivity.java b/app/src/main/java/com/wall/exquisite/wallpaper/StartuppageActivity.java similarity index 81% rename from test2/src/main/java/com/wall/exquisite/wallpaper/StartuppageActivity.java rename to app/src/main/java/com/wall/exquisite/wallpaper/StartuppageActivity.java index d940175..b1ac2fd 100644 --- a/test2/src/main/java/com/wall/exquisite/wallpaper/StartuppageActivity.java +++ b/app/src/main/java/com/wall/exquisite/wallpaper/StartuppageActivity.java @@ -11,11 +11,10 @@ import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; -import com.ad.tradpluslibrary.TPAdManager; +import com.ad.ironsourcelibrary.ISAdManager; import kotlin.Unit; import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function1; public class StartuppageActivity extends AppCompatActivity { @@ -35,21 +34,6 @@ public class StartuppageActivity extends AppCompatActivity { // 初始化控件 progressBar = findViewById(R.id.progressBar); - TPAdManager.INSTANCE.init( - this, - WallpaperApplication.TAG, - "11AFE68410E60AB7D990BD9CBA814411", - "83D1FF0E14FCB01E5F26038F91114512", - "BB1B407D3DC75FE8C6E3205D2E6B3E12", - "FB5CA4DF6B924ADF06C3C0C25C880212", - new Function0() { - @Override - public Unit invoke() { - return null; - } - } - ) ; - // 初始化并启动CountDownTimer倒计时 initCountDownTimer(); @@ -68,7 +52,7 @@ public class StartuppageActivity extends AppCompatActivity { // CountDownTimer参数说明： // 第一个参数：总倒计时时长（ms） // 第二个参数：倒计时间隔（ms），每隔这个时间回调一次onTick - countDownTimer = TPAdManager.INSTANCE.showWelcomeAd(this, totalTime, aLong -> { + countDownTimer = ISAdManager.showWelcomeAd(this, totalTime, aLong -> { Long progressPercentage = (100 * aLong) / totalTime; Long percentage = 100 - progressPercentage; progressBar.setProgress(Integer.parseInt(percentage.toString())); diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/Urls.java b/app/src/main/java/com/wall/exquisite/wallpaper/Urls.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/Urls.java rename to app/src/main/java/com/wall/exquisite/wallpaper/Urls.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/User.java b/app/src/main/java/com/wall/exquisite/wallpaper/User.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/User.java rename to app/src/main/java/com/wall/exquisite/wallpaper/User.java diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/WallpaperApplication.java b/app/src/main/java/com/wall/exquisite/wallpaper/WallpaperApplication.java similarity index 82% rename from test2/src/main/java/com/wall/exquisite/wallpaper/WallpaperApplication.java rename to app/src/main/java/com/wall/exquisite/wallpaper/WallpaperApplication.java index 37b2a46..6fac7a2 100644 --- a/test2/src/main/java/com/wall/exquisite/wallpaper/WallpaperApplication.java +++ b/app/src/main/java/com/wall/exquisite/wallpaper/WallpaperApplication.java @@ -5,12 +5,16 @@ import android.os.Handler; import android.os.Looper; import android.util.Log; +import com.ad.ironsourcelibrary.ISAdManager; +import com.unity3d.mediation.LevelPlayConfiguration; +import com.unity3d.mediation.LevelPlayInitError; import com.up.uploadlibrary.UpLoadManager; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import kotlin.Unit; +import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function2; // 导入你的收藏工具类 @@ -41,6 +45,17 @@ public class WallpaperApplication extends Application { initBasicTools(); // 异步执行耗时数据准备 initDataAsync(); + ISAdManager.INSTANCE.init("---------------", this, "24e10d635", "z99sdrvrcmrnsr4b", "q3apcnd67q25tkr7", "hrnbibnvrc7akls1", false, new Function1() { + @Override + public Unit invoke(LevelPlayConfiguration levelPlayConfiguration) { + return null; + } + }, new Function1() { + @Override + public Unit invoke(LevelPlayInitError levelPlayInitError) { + return null; + } + }); } private void initBasicTools() { diff --git a/app/src/main/java/com/wall/exquisite/wallpaper/WallpaperType.java b/app/src/main/java/com/wall/exquisite/wallpaper/WallpaperType.java new file mode 100644 index 0000000..557ff76 --- /dev/null +++ b/app/src/main/java/com/wall/exquisite/wallpaper/WallpaperType.java @@ -0,0 +1,7 @@ +package com.wall.exquisite.wallpaper; + +interface WallpaperType { + int TYPE_HOME = 1; // 桌面 + int TYPE_LOCK = 2; // 锁屏 + int TYPE_BOTH = 3; // 桌面+锁屏 +} \ No newline at end of file diff --git a/test2/src/main/java/com/wall/exquisite/wallpaper/Wallpaper_Item.java b/app/src/main/java/com/wall/exquisite/wallpaper/Wallpaper_Item.java similarity index 100% rename from test2/src/main/java/com/wall/exquisite/wallpaper/Wallpaper_Item.java rename to app/src/main/java/com/wall/exquisite/wallpaper/Wallpaper_Item.java diff --git a/test2/src/main/res/drawable/aix.png b/app/src/main/res/drawable/aix.png similarity index 100% rename from test2/src/main/res/drawable/aix.png rename to app/src/main/res/drawable/aix.png diff --git a/test2/src/main/res/drawable/beij11.jpg b/app/src/main/res/drawable/beij11.jpg similarity index 100% rename from test2/src/main/res/drawable/beij11.jpg rename to app/src/main/res/drawable/beij11.jpg diff --git a/test2/src/main/res/drawable/beij13.jpg b/app/src/main/res/drawable/beij13.jpg similarity index 100% rename from test2/src/main/res/drawable/beij13.jpg rename to app/src/main/res/drawable/beij13.jpg diff --git a/test2/src/main/res/drawable/both1.png b/app/src/main/res/drawable/both1.png similarity index 100% rename from test2/src/main/res/drawable/both1.png rename to app/src/main/res/drawable/both1.png diff --git a/test2/src/main/res/drawable/dialog_rounded_bg.xml b/app/src/main/res/drawable/dialog_rounded_bg.xml similarity index 100% rename from test2/src/main/res/drawable/dialog_rounded_bg.xml rename to app/src/main/res/drawable/dialog_rounded_bg.xml diff --git a/test2/src/main/res/drawable/hert.png b/app/src/main/res/drawable/hert.png similarity index 100% rename from test2/src/main/res/drawable/hert.png rename to app/src/main/res/drawable/hert.png diff --git a/test2/src/main/res/drawable/home2.png b/app/src/main/res/drawable/home2.png similarity index 100% rename from test2/src/main/res/drawable/home2.png rename to app/src/main/res/drawable/home2.png diff --git a/test2/src/main/res/drawable/left.png b/app/src/main/res/drawable/left.png similarity index 100% rename from test2/src/main/res/drawable/left.png rename to app/src/main/res/drawable/left.png diff --git a/test2/src/main/res/drawable/like.png b/app/src/main/res/drawable/like.png similarity index 100% rename from test2/src/main/res/drawable/like.png rename to app/src/main/res/drawable/like.png diff --git a/test2/src/main/res/drawable/like_red.png b/app/src/main/res/drawable/like_red.png similarity index 100% rename from test2/src/main/res/drawable/like_red.png rename to app/src/main/res/drawable/like_red.png diff --git a/test2/src/main/res/drawable/load.png b/app/src/main/res/drawable/load.png similarity index 100% rename from test2/src/main/res/drawable/load.png rename to app/src/main/res/drawable/load.png diff --git a/test2/src/main/res/drawable/load_ing.png b/app/src/main/res/drawable/load_ing.png similarity index 100% rename from test2/src/main/res/drawable/load_ing.png rename to app/src/main/res/drawable/load_ing.png diff --git a/test2/src/main/res/drawable/loading.jpg b/app/src/main/res/drawable/loading.jpg similarity index 100% rename from test2/src/main/res/drawable/loading.jpg rename to app/src/main/res/drawable/loading.jpg diff --git a/test2/src/main/res/drawable/lock1.png b/app/src/main/res/drawable/lock1.png similarity index 100% rename from test2/src/main/res/drawable/lock1.png rename to app/src/main/res/drawable/lock1.png diff --git a/test2/src/main/res/drawable/oval.xml b/app/src/main/res/drawable/oval.xml similarity index 100% rename from test2/src/main/res/drawable/oval.xml rename to app/src/main/res/drawable/oval.xml diff --git a/test2/src/main/res/drawable/retc_16.xml b/app/src/main/res/drawable/retc_16.xml similarity index 100% rename from test2/src/main/res/drawable/retc_16.xml rename to app/src/main/res/drawable/retc_16.xml diff --git a/test2/src/main/res/drawable/retc_19.xml b/app/src/main/res/drawable/retc_19.xml similarity index 100% rename from test2/src/main/res/drawable/retc_19.xml rename to app/src/main/res/drawable/retc_19.xml diff --git a/test2/src/main/res/drawable/right3.png b/app/src/main/res/drawable/right3.png similarity index 100% rename from test2/src/main/res/drawable/right3.png rename to app/src/main/res/drawable/right3.png diff --git a/test2/src/main/res/drawable/setting2.png b/app/src/main/res/drawable/setting2.png similarity index 100% rename from test2/src/main/res/drawable/setting2.png rename to app/src/main/res/drawable/setting2.png diff --git a/test2/src/main/res/drawable/shape_gray_bg.xml b/app/src/main/res/drawable/shape_gray_bg.xml similarity index 100% rename from test2/src/main/res/drawable/shape_gray_bg.xml rename to app/src/main/res/drawable/shape_gray_bg.xml diff --git a/test2/src/main/res/drawable/sj.png b/app/src/main/res/drawable/sj.png similarity index 100% rename from test2/src/main/res/drawable/sj.png rename to app/src/main/res/drawable/sj.png diff --git a/test2/src/main/res/drawable/xiangp.png b/app/src/main/res/drawable/xiangp.png similarity index 100% rename from test2/src/main/res/drawable/xiangp.png rename to app/src/main/res/drawable/xiangp.png diff --git a/test2/src/main/res/drawable/xingxing.png b/app/src/main/res/drawable/xingxing.png similarity index 100% rename from test2/src/main/res/drawable/xingxing.png rename to app/src/main/res/drawable/xingxing.png diff --git a/test2/src/main/res/layout/activity_collection.xml b/app/src/main/res/layout/activity_collection.xml similarity index 100% rename from test2/src/main/res/layout/activity_collection.xml rename to app/src/main/res/layout/activity_collection.xml diff --git a/app/src/main/res/layout/activity_full_image.xml b/app/src/main/res/layout/activity_full_image.xml new file mode 100644 index 0000000..1e975aa --- /dev/null +++ b/app/src/main/res/layout/activity_full_image.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test2/src/main/res/layout/activity_main2.xml b/app/src/main/res/layout/activity_main2.xml similarity index 100% rename from test2/src/main/res/layout/activity_main2.xml rename to app/src/main/res/layout/activity_main2.xml diff --git a/test2/src/main/res/layout/activity_startuppage.xml b/app/src/main/res/layout/activity_startuppage.xml similarity index 100% rename from test2/src/main/res/layout/activity_startuppage.xml rename to app/src/main/res/layout/activity_startuppage.xml diff --git a/test2/src/main/res/layout/custom_innertab.xml b/app/src/main/res/layout/custom_innertab.xml similarity index 100% rename from test2/src/main/res/layout/custom_innertab.xml rename to app/src/main/res/layout/custom_innertab.xml diff --git a/test2/src/main/res/layout/custom_outertab.xml b/app/src/main/res/layout/custom_outertab.xml similarity index 100% rename from test2/src/main/res/layout/custom_outertab.xml rename to app/src/main/res/layout/custom_outertab.xml diff --git a/test2/src/main/res/layout/dialog_rateus.xml b/app/src/main/res/layout/dialog_rateus.xml similarity index 100% rename from test2/src/main/res/layout/dialog_rateus.xml rename to app/src/main/res/layout/dialog_rateus.xml diff --git a/test2/src/main/res/layout/dialog_wallpapertype.xml b/app/src/main/res/layout/dialog_wallpapertype.xml similarity index 100% rename from test2/src/main/res/layout/dialog_wallpapertype.xml rename to app/src/main/res/layout/dialog_wallpapertype.xml diff --git a/test2/src/main/res/layout/fragment_animals.xml b/app/src/main/res/layout/fragment_animals.xml similarity index 100% rename from test2/src/main/res/layout/fragment_animals.xml rename to app/src/main/res/layout/fragment_animals.xml diff --git a/test2/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml similarity index 100% rename from test2/src/main/res/layout/fragment_home.xml rename to app/src/main/res/layout/fragment_home.xml diff --git a/test2/src/main/res/layout/fragment_nature.xml b/app/src/main/res/layout/fragment_nature.xml similarity index 100% rename from test2/src/main/res/layout/fragment_nature.xml rename to app/src/main/res/layout/fragment_nature.xml diff --git a/test2/src/main/res/layout/fragment_patterns.xml b/app/src/main/res/layout/fragment_patterns.xml similarity index 100% rename from test2/src/main/res/layout/fragment_patterns.xml rename to app/src/main/res/layout/fragment_patterns.xml diff --git a/test2/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml similarity index 100% rename from test2/src/main/res/layout/fragment_setting.xml rename to app/src/main/res/layout/fragment_setting.xml diff --git a/test2/src/main/res/layout/item_animals_image.xml b/app/src/main/res/layout/item_animals_image.xml similarity index 100% rename from test2/src/main/res/layout/item_animals_image.xml rename to app/src/main/res/layout/item_animals_image.xml diff --git a/test2/src/main/res/layout/item_nature_image.xml b/app/src/main/res/layout/item_nature_image.xml similarity index 100% rename from test2/src/main/res/layout/item_nature_image.xml rename to app/src/main/res/layout/item_nature_image.xml diff --git a/test2/src/main/res/layout/item_patterns_image.xml b/app/src/main/res/layout/item_patterns_image.xml similarity index 100% rename from test2/src/main/res/layout/item_patterns_image.xml rename to app/src/main/res/layout/item_patterns_image.xml diff --git a/test2/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from test2/src/main/res/mipmap-mdpi/ic_launcher.webp rename to app/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/test2/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from test2/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/test2/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from test2/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to app/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/test2/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from test2/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/test2/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from test2/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/test2/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from test2/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/test2/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from test2/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/test2/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from test2/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/test2/src/main/res/mipmap/applogo.png b/app/src/main/res/mipmap/applogo.png similarity index 100% rename from test2/src/main/res/mipmap/applogo.png rename to app/src/main/res/mipmap/applogo.png diff --git a/test2/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml similarity index 100% rename from test2/src/main/res/values-night/themes.xml rename to app/src/main/res/values-night/themes.xml diff --git a/test2/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from test2/src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/test2/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from test2/src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/test2/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from test2/src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/test2/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml similarity index 100% rename from test2/src/main/res/values/themes.xml rename to app/src/main/res/values/themes.xml diff --git a/test2/src/main/res/xml/net.xml b/app/src/main/res/xml/net.xml similarity index 100% rename from test2/src/main/res/xml/net.xml rename to app/src/main/res/xml/net.xml diff --git a/test2/src/test/java/com/example/test2/ExampleUnitTest.java b/app/src/test/java/com/example/test2/ExampleUnitTest.java similarity index 100% rename from test2/src/test/java/com/example/test2/ExampleUnitTest.java rename to app/src/test/java/com/example/test2/ExampleUnitTest.java diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fc5ae52..bc336a9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.7.2" +agp = "8.10.1" junit = "4.13.2" junitVersion = "1.3.0" espressoCore = "3.7.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 852efa1..2770a27 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Thu Nov 20 16:49:11 CST 2025 +#Tue Jan 13 15:18:33 CST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/keystore.properties b/keystore.properties index 53bfdcd..53a90c0 100644 --- a/keystore.properties +++ b/keystore.properties @@ -1,6 +1,6 @@ app_name=Wallpaper Exquisite package_name=com.wall.exquisite.wallpaper -keystoreFile=test2/WallpaperExquisite.jks +keystoreFile=WallpaperExquisite.jks key_alias=WallpaperExquisitekey0 key_store_password=654321 key_password=654321 \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 5591c2b..0f19a72 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,31 +17,30 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - google() // 用于依赖 + google() mavenCentral() - maven { url = uri("https://jitpack.io") } - //------------------------- TradPlus - // Ironsource - maven { url = uri("https://android-sdk.is.com/") } - // Pangle + + //------------------------- IronSource + maven { + url = uri("https://android-sdk.is.com/") + } + maven { + url = uri("https://dl.bintray.com/ironsource-mobile/android-sdk") + } + maven { + url = uri("https://dl.bintray.com/ironsource-mobile/android-adapters") + } + maven { + url = uri("https://cboost.jfrog.io/artifactory/chartboost-ads/") + } + maven { + url = uri("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") + } maven { url = uri("https://artifact.bytedance.com/repository/pangle") } - // Chartboost - maven { url = uri("https://cboost.jfrog.io/artifactory/chartboost-ads/") } - maven { - name = "Chartboost Mediation’s maven repo" - url = uri("https://cboost.jfrog.io/artifactory/chartboost-mediation") - } - // Mintegral - //Launch GP market application， Android X Version - //If you fail to pull the code using gradle, add the maven warehouse configuration to the project root build.gradle file - maven { - url = - uri("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") - } } } -rootProject.name = "My Application" -include(":test2") +rootProject.name = "Wallpaper Exquisite" +include(":app") diff --git a/test2/build.gradle.kts b/test2/build.gradle.kts deleted file mode 100644 index 860376c..0000000 --- a/test2/build.gradle.kts +++ /dev/null @@ -1,165 +0,0 @@ -import java.text.SimpleDateFormat -import java.util.Date - -plugins { - alias(libs.plugins.android.application) - id("com.google.gms.google-services") - id("com.google.firebase.crashlytics") -} -val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) - -android { - namespace = "com.wall.exquisite.wallpaper" - compileSdk = 36 - - defaultConfig { - applicationId = "com.wall.exquisite.wallpaper" - minSdk = 24 - targetSdk = 36 - versionCode = 2 - versionName = "2.0" - setProperty("archivesBaseName","Wallpaper Exquisite_v"+versionName+"(${versionCode})_$timestamp") - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - - - buildTypes { - release { - isMinifyEnabled = true - proguardFiles( - getDefaultProguardFile("proguard-android-optimize.txt"), - "proguard-rules.pro" - ) - } - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } - - buildFeatures { -// viewBinding = true - dataBinding=true - } -} - -dependencies { - implementation(libs.appcompat) - implementation(libs.material) - implementation("androidx.activity:activity:1.10.0") - implementation(libs.constraintlayout) - testImplementation(libs.junit) - androidTestImplementation(libs.ext.junit) - androidTestImplementation(libs.espresso.core) - - // 图片加载库 - implementation("com.github.bumptech.glide:glide:4.16.0") - annotationProcessor("com.github.bumptech.glide:compiler:4.16.0") - - // JSON解析 - implementation("com.google.code.gson:gson:2.10.1") - - // 其他UI组件 - implementation("androidx.viewpager2:viewpager2:1.0.0") - implementation("androidx.recyclerview:recyclerview:1.3.2") - // 图片缩放库（必加，否则无法缩放大图） - implementation("com.github.chrisbanes:PhotoView:2.3.0") - - - implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.appcompat:appcompat:1.6.1") - - // 新增：Glide Transform扩展（用于圆角变换） - implementation ("jp.wasabeef:glide-transformations:4.3.0") - - implementation ("androidx.constraintlayout:constraintlayout:2.1.4") - - implementation(files("libs/TradPlusLibrary_11_25_15_02-release.aar")) - implementation(files("libs/UpLoadLibrary_12_03_15_13-release.aar")) - implementation ("com.squareup.okhttp3:okhttp:4.12.0") - implementation("com.squareup.okhttp3:logging-interceptor:4.12.0") - - implementation ("com.google.android.gms:play-services-ads-identifier:18.0.1") - - // TradPlus - implementation("com.tradplusad:tradplus:14.5.0.1") - //noinspection GradleCompatible - implementation("androidx.legacy:legacy-support-v4:1.0.0") - implementation("androidx.appcompat:appcompat:1.3.0-alpha02") - // Meta - implementation("com.facebook.android:audience-network-sdk:6.20.0") - implementation("com.tradplusad:tradplus-facebook:1.14.5.0.1") - // Applovin - implementation("com.applovin:applovin-sdk:13.3.1") - implementation("com.tradplusad:tradplus-applovin:9.14.5.0.1") - implementation("com.google.android.gms:play-services-ads-identifier:18.2.0") - // Ironsource - implementation("com.ironsource.sdk:mediationsdk:8.10.0") - implementation("com.tradplusad:tradplus-ironsource:10.14.5.0.1") - implementation("com.google.android.gms:play-services-appset:16.0.0") - implementation("com.google.android.gms:play-services-ads-identifier:17.0.0") - implementation("com.google.android.gms:play-services-basement:17.5.0") - // Adcolony - implementation("com.adcolony:sdk:4.8.0") - implementation("com.tradplusad:tradplus-adcolony:4.14.5.0.1") - implementation("com.google.android.gms:play-services-ads-identifier:17.0.0") - // Pangle - implementation("com.tradplusad:tradplus-pangle:19.14.5.0.1") - implementation("com.pangle.global:pag-sdk:7.3.0.3") - // UnityAds - implementation("com.tradplusad:tradplus-unity:5.14.5.0.1") - implementation("com.unity3d.ads:unity-ads:4.15.1") - // Chartboost - implementation("com.tradplusad:tradplus-chartboostx:15.14.5.0.1") - implementation("com.chartboost:chartboost-sdk:9.8.3") - implementation("com.google.android.gms:play-services-ads-identifier:17.0.0") - implementation("com.google.android.gms:play-services-base:17.4.0") - // Inmobi - implementation("com.tradplusad:tradplus-inmobix:23.14.5.0.1") - implementation("com.inmobi.monetization:inmobi-ads-kotlin:10.8.3") - implementation("androidx.core:core-ktx:1.5.0") - implementation("com.inmobi.omsdk:inmobi-omsdk:1.5.2.0") - // Fyber - implementation("com.fyber:marketplace-sdk:8.3.7") - implementation("com.tradplusad:tradplus-fyber:24.14.5.0.1") - implementation("com.google.android.gms:play-services-ads-identifier:17.0.0") - implementation("com.google.android.gms:play-services-base:17.4.0") - // Start.io - implementation("com.startapp:inapp-sdk:5.2.3") - implementation("com.tradplusad:tradplus-startapp:28.14.5.0.1") - // Mintegral - implementation("com.tradplusad:tradplus-mintegralx_overseas:18.14.5.0.1") - implementation("androidx.recyclerview:recyclerview:1.1.0") - implementation("com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.71") - // Liftoff - implementation("com.tradplusad:tradplus-vunglex:7.14.5.0.1") - implementation("com.vungle:vungle-ads:7.5.0") - // Yandex - implementation("com.yandex.android:mobileads:7.13.0") { - exclude(group = "com.caverock", module = "androidsvg-aar") - } - implementation("com.tradplusad:tradplus-yandex:50.14.6.10.1") - // Bigo - implementation("com.bigossp:bigo-ads:5.4.0") - implementation("com.tradplusad:tradplus-bigo:57.14.5.0.1") - // Cross Promotion - implementation("com.tradplusad:tradplus-crosspromotion:27.14.5.0.1") - // TP Exchange - // 请注意保持与主包版本同步更新 - implementation("com.google.code.gson:gson:2.8.6") - implementation("com.tradplusad:tp_exchange:40.14.5.0.1") - - // Google UMP - implementation ("com.google.android.ump:user-messaging-platform:3.2.0") - - // TradPlus Tools - // implementation 'com.tradplusad:tradplus-tool:1.1.4' - - //firebase - 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") -} \ No newline at end of file diff --git a/test2/libs/TradPlusLibrary_11_25_15_02-release.aar b/test2/libs/TradPlusLibrary_11_25_15_02-release.aar deleted file mode 100644 index 803bb1c..0000000 Binary files a/test2/libs/TradPlusLibrary_11_25_15_02-release.aar and /dev/null differ diff --git a/test2/release/Wallpaper Exquisite_v1.0(1)_12_05_14_18-release.apk b/test2/release/Wallpaper Exquisite_v1.0(1)_12_05_14_18-release.apk deleted file mode 100644 index 28b3a30..0000000 Binary files a/test2/release/Wallpaper Exquisite_v1.0(1)_12_05_14_18-release.apk and /dev/null differ diff --git a/test2/release/Wallpaper Exquisite_v1.0(1)_12_05_14_21-release.aab b/test2/release/Wallpaper Exquisite_v1.0(1)_12_05_14_21-release.aab deleted file mode 100644 index 00d20df..0000000 Binary files a/test2/release/Wallpaper Exquisite_v1.0(1)_12_05_14_21-release.aab and /dev/null differ diff --git a/test2/release/baselineProfiles/0/Wallpaper Exquisite_v2.0(2)_12_16_14_45-release.dm b/test2/release/baselineProfiles/0/Wallpaper Exquisite_v2.0(2)_12_16_14_45-release.dm deleted file mode 100644 index c86c39a..0000000 Binary files a/test2/release/baselineProfiles/0/Wallpaper Exquisite_v2.0(2)_12_16_14_45-release.dm and /dev/null differ diff --git a/test2/release/baselineProfiles/1/Wallpaper Exquisite_v2.0(2)_12_16_14_45-release.dm b/test2/release/baselineProfiles/1/Wallpaper Exquisite_v2.0(2)_12_16_14_45-release.dm deleted file mode 100644 index 63c1f4a..0000000 Binary files a/test2/release/baselineProfiles/1/Wallpaper Exquisite_v2.0(2)_12_16_14_45-release.dm and /dev/null differ diff --git a/test2/release/output-metadata.json b/test2/release/output-metadata.json deleted file mode 100644 index 48b54ab..0000000 --- a/test2/release/output-metadata.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "com.wall.exquisite.wallpaper", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 2, - "versionName": "2.0", - "outputFile": "Wallpaper Exquisite_v2.0(2)_12_16_14_45-release.apk" - } - ], - "elementType": "File", - "baselineProfiles": [ - { - "minApi": 28, - "maxApi": 30, - "baselineProfiles": [ - "baselineProfiles/1/Wallpaper Exquisite_v2.0(2)_12_16_14_45-release.dm" - ] - }, - { - "minApi": 31, - "maxApi": 2147483647, - "baselineProfiles": [ - "baselineProfiles/0/Wallpaper Exquisite_v2.0(2)_12_16_14_45-release.dm" - ] - } - ], - "minSdkVersionForDexing": 24 -} \ No newline at end of file diff --git a/test2/src/main/res/layout/activity_full_image.xml b/test2/src/main/res/layout/activity_full_image.xml deleted file mode 100644 index 04bb96a..0000000 --- a/test2/src/main/res/layout/activity_full_image.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file