V1.0.1(2) topon+参数上传

2025-05-16 14:47:35 +08:00 · 2025-05-16 14:47:35 +08:00 · 3797bd5b6c
commit 3797bd5b6c
parent 0359f71645
22 changed files with 1211 additions and 57 deletions
--- 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.firebase.crashlytics")
+    id("com.google.gms.google-services")
    id("io.objectbox")
 }
 val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date())
@ -18,8 +18,8 @@ android {
        applicationId = "com.ar.drawing.art"
        minSdk = 23
        targetSdk = 34
-        versionCode = 1
-        versionName = "1.0.0"
+        versionCode = 2
+        versionName = "1.0.1"
        setProperty(
            "archivesBaseName",
            "AR Drawing Art_V" + versionName + "(${versionCode})_$timestamp"
@ -53,7 +53,7 @@ dependencies {
    implementation("androidx.appcompat:appcompat:1.7.0")
    implementation("com.google.android.material:material:1.12.0")
    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-//    implementation("com.google.android.gms:play-services-location:21.3.0")
+
    testImplementation("junit:junit:4.13.2")
    androidTestImplementation("androidx.test.ext:junit:1.1.5")
    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
@ -78,4 +78,105 @@ dependencies {
    implementation("com.google.android.gms:play-services-ads-identifier:18.0.1")
    implementation("com.google.android.gms:play-services-appset:16.0.1")
    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+
+//    implementation ("com.squareup.okhttp3:okhttp:4.12.0")
+//    implementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
+
+
+    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
+
 }
--- a/app/google-services.json
+++ b/app/google-services.json
@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "968735131459",
+    "project_id": "ar-drawing-art",
+    "storage_bucket": "ar-drawing-art.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:968735131459:android:e7331637a9a5b39383d1f6",
+        "android_client_info": {
+          "package_name": "com.ar.drawing.art"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA09R-vY19GHq0jPOblOymSc6I5iY8q18c"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -19,4 +19,131 @@
 # If you keep the line number information, uncomment this to
 # 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 <methods>;
+ }
+ -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
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -16,7 +16,7 @@
        android:maxSdkVersion="32"
        tools:ignore="ScopedStorage" />
    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <application
        android:name="com.ar.drawing.art.utils.ArtApp"
--- a/app/src/main/java/com/ar/drawing/art/activity/UIAllList.java
+++ b/app/src/main/java/com/ar/drawing/art/activity/UIAllList.java
@ -8,6 +8,8 @@ import androidx.recyclerview.widget.GridLayoutManager;

 import com.ar.drawing.art.adapter.AdaAllList;
 import com.ar.drawing.art.databinding.UiAllListBinding;
+import com.ar.drawing.art.topon.AdManager;
+import com.ar.drawing.art.topon.onActionListener;
 import com.ar.drawing.art.utils.ArtApp;
 import com.ar.drawing.art.utils.Common;
 import com.ar.drawing.art.utils.ItemDec;
@ -30,11 +32,17 @@ public class UIAllList extends AppCompatActivity {
        Common.setStatusBarTextColor(this, true);
        dirStr = getIntent().getStringExtra(ArtApp.Key_ViewDir);
        preViewBinding.categoryName.setText(dirStr.substring(dirStr.lastIndexOf("_") + 1));
-
+        AdManager.loadAllAd();


        onInitList();
        onInitClick();
+        AdManager.showTopOn(UIAllList.this, new onActionListener() {
+            @Override
+            public void onAction() {
+
+            }
+        });
    }

    private void onInitList() {
@ -51,7 +59,13 @@ public class UIAllList extends AppCompatActivity {
        preViewBinding.back.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
-                finish();
+                AdManager.showTopOn(UIAllList.this, new onActionListener() {
+                    @Override
+                    public void onAction() {
+                        finish();
+                    }
+                });
+
            }
        });
    }
--- a/app/src/main/java/com/ar/drawing/art/activity/UIDetail.java
+++ b/app/src/main/java/com/ar/drawing/art/activity/UIDetail.java
@ -32,6 +32,8 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;

 import com.ar.drawing.art.dataman.MyDataBase;
+import com.ar.drawing.art.topon.AdManager;
+import com.ar.drawing.art.topon.onActionListener;
 import com.ar.drawing.art.utils.Common;
 import com.ar.drawing.art.utils.ArtApp;
 import com.google.common.util.concurrent.ListenableFuture;
@ -79,7 +81,7 @@ public class UIDetail extends AppCompatActivity implements View.OnTouchListener,
        Intent intent = getIntent();
        isMain = intent.getBooleanExtra(ArtApp.Key_ISMAIN, false);

-
+        AdManager.loadAllAd();
        previewView = findViewById(R.id.preview);
        imageView = findViewById(R.id.image);
        imBack = findViewById(R.id.back);
@ -90,6 +92,12 @@ public class UIDetail extends AppCompatActivity implements View.OnTouchListener,
        imZoom = findViewById(R.id.im_zoom);
        imFavorite = findViewById(R.id.im_favorite);

+        AdManager.showTopOn(UIDetail.this, new onActionListener() {
+            @Override
+            public void onAction() {
+
+            }
+        });


        curBitmapPath = getIntent().getStringExtra(ArtApp.Key_Camera);
@ -216,8 +224,14 @@ public class UIDetail extends AppCompatActivity implements View.OnTouchListener,
                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(UIDetail.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);
@ -225,15 +239,22 @@ public class UIDetail extends AppCompatActivity implements View.OnTouchListener,
                    seekBar.setVisibility(View.VISIBLE);
                }
            }else if(v.equals(imFavorite)){
-                boolean selected =  imFavorite.isSelected();
-                 imFavorite.setSelected(!selected);
-                boolean newSelect =  imFavorite.isSelected();
-                if(newSelect){
-                    MyDataBase.insertOrUpdateLike(curBitmapPath);
-                }else {
-                    MyDataBase.deleteLike(curBitmapPath);
+                AdManager.showTopOn(UIDetail.this, new onActionListener() {
+                    @Override
+                    public void onAction() {
+                        boolean selected =  imFavorite.isSelected();
+                        imFavorite.setSelected(!selected);
+                        boolean newSelect =  imFavorite.isSelected();
+                        if(newSelect){
+                            MyDataBase.insertOrUpdateLike(curBitmapPath);
+                        }else {
+                            MyDataBase.deleteLike(curBitmapPath);
+
+                        }
+                    }
+                });
+

-                }
            }
        }

--- a/app/src/main/java/com/ar/drawing/art/activity/UIMain.java
+++ b/app/src/main/java/com/ar/drawing/art/activity/UIMain.java
@ -18,6 +18,9 @@ import com.ar.drawing.art.databinding.UiHomeBinding;
 import com.ar.drawing.art.fragmen.FragFavorite;
 import com.ar.drawing.art.fragmen.FragGallery;
 import com.ar.drawing.art.fragmen.FragHome;
+import com.ar.drawing.art.upload.Http;
+import com.ar.drawing.art.upload.SaveUtils;
+import com.ar.drawing.art.utils.ArtApp;
 import com.ar.drawing.art.utils.Common;
 import com.google.android.material.tabs.TabLayout;

@ -43,7 +46,11 @@ public class UIMain extends AppCompatActivity {
        listFragment.add(FragHome.newInstance());
        listFragment.add(FragGallery.newInstance());
        listFragment.add(FragFavorite.newInstance());
-
+        boolean post = SaveUtils.INSTANCE.isPost();
+        if(!post){
+            Http.INSTANCE.makeGetRequest(UIMain.this);
+            SaveUtils.INSTANCE.setPost(true);
+        }
        onTabInit();
        binding.viewPager2.setUserInputEnabled(false);
        binding.viewPager2.setAdapter(new FragmentStateAdapter(this) {
--- a/app/src/main/java/com/ar/drawing/art/activity/UIWelcome.java
+++ b/app/src/main/java/com/ar/drawing/art/activity/UIWelcome.java
@ -7,12 +7,17 @@ import android.os.CountDownTimer;
 import androidx.appcompat.app.AppCompatActivity;

 import com.ar.drawing.art.databinding.UiWelcomeBinding;
+import com.ar.drawing.art.topon.AdManager;
 import com.ar.drawing.art.utils.Common;

+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
+
 public class UIWelcome extends AppCompatActivity {

    private UiWelcomeBinding binding;
-    private long time = 1000;
+    private long time = 11000;
    private CountDownTimer countDownTimer;


@ -23,20 +28,21 @@ public class UIWelcome extends AppCompatActivity {
        setContentView(binding.getRoot());
        Common.setStatusBarTextColor(this, true);

-
-        countDownTimer= new CountDownTimer(time,100) {
+        countDownTimer = AdManager.showWelcomeAd(UIWelcome.this, time, new Function1<Long, Unit>() {
            @Override
-            public void onTick(long millisUntilFinished) {
-                int progressPercentage = (int) ((100 * millisUntilFinished) / time);
+            public Unit invoke(Long aLong) {
+                int progressPercentage = (int) ((100 * aLong) / time);
                int Percentage = 100 - progressPercentage;
                binding.loadingPb.setProgress(Percentage);
+                return null;
            }
-
+        }, new Function0<Unit>() {
            @Override
-            public void onFinish() {
+            public Unit invoke() {
                enterMain();
+                return null;
            }
-        };
+        });
        countDownTimer.start();
    }
    private void enterMain() {
--- a/app/src/main/java/com/ar/drawing/art/fragmen/FragGallery.java
+++ b/app/src/main/java/com/ar/drawing/art/fragmen/FragGallery.java
@ -24,6 +24,8 @@ import com.ar.drawing.art.adapter.AdaImport;
 import com.ar.drawing.art.databinding.FragGalleryBinding;
 import com.ar.drawing.art.dataman.ImportBean;
 import com.ar.drawing.art.dataman.MyDataBase;
+import com.ar.drawing.art.topon.AdManager;
+import com.ar.drawing.art.topon.onActionListener;
 import com.ar.drawing.art.utils.ArtApp;
 import com.ar.drawing.art.utils.Common;
 import com.ar.drawing.art.utils.ItemDec;
@ -71,7 +73,13 @@ public class FragGallery 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();
+                    }
+                });
+
            }
        });

--- a/app/src/main/java/com/ar/drawing/art/topon/AdListener.kt
+++ b/app/src/main/java/com/ar/drawing/art/topon/AdListener.kt
@ -0,0 +1,11 @@
+package com.ar.drawing.art.topon
+
+interface AdListener {
+
+    fun loadFail(placeId: String)
+    fun showSuccess()
+
+    fun showFail()
+
+    fun showClose()
+}
--- a/app/src/main/java/com/ar/drawing/art/topon/AdManager.kt
+++ b/app/src/main/java/com/ar/drawing/art/topon/AdManager.kt
@ -0,0 +1,223 @@
+package com.ar.drawing.art.topon
+
+import android.app.Activity
+import android.os.CountDownTimer
+import android.util.Log
+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.art.utils.ArtApp
+
+
+object AdManager {
+
+    //上次广告展示时刻
+    var LAST_AD_SHOW = 0L
+
+    const val type_no_cache = 0
+    const val type_has_cache = 1
+    const val type_show_success = 2
+    const val type_show_close = 3
+    const val type_show_fail = 4
+
+    /**
+    Art_INTER_3
+    n68269d0d9b271
+    Art_INTER_2
+    n68269d016ea6c
+    Art_INTER_1
+    n68269cef62431
+     */
+
+    const val place1Id = "n68269d0d9b271"
+    const val place2Id = "n68269d016ea6c"
+    const val place3Id = "n68269cef62431"
+
+
+    var place1LoadFail = false
+    var place2LoadFail = false
+    var place3LoadFail = false
+
+    val list = mutableListOf<ATInterstitial>()
+     val mContext = ArtApp.app
+    val mTAG = ArtApp.TAG
+    @JvmStatic
+    fun loadAllAd() {
+        if (list.size <= 0) {
+            val mInterstitialAd1 = ATInterstitial(mContext, place1Id)
+            val mInterstitialAd2 = ATInterstitial(mContext, place2Id)
+            val mInterstitialAd3 = ATInterstitial(mContext, place3Id)
+            list.add(mInterstitialAd1)
+            list.add(mInterstitialAd2)
+            list.add(mInterstitialAd3)
+        }
+        for (ad in list) {
+            if (!ad.isAdReady) {
+                setCallBack(ad, object : AdListener {
+                    override fun loadFail(placeId: String) {
+                        if (placeId == place1Id) {
+                            place1LoadFail = true
+                        }
+                        if (placeId == place2Id) {
+                            place2LoadFail = true
+                        }
+                        if (placeId == place3Id) {
+                            place3LoadFail = true
+                        }
+                    }
+
+                    override fun showSuccess() {
+
+                    }
+
+                    override fun showFail() {
+
+                    }
+
+                    override fun showClose() {
+
+                    }
+
+                })
+                ad.load()
+            }
+        }
+
+
+    }
+
+    @JvmStatic
+    fun getReadyAd(): ATInterstitial? {
+        list.shuffle()
+        for (ad in list) {
+            if (ad.isAdReady) {
+                Log.d(mTAG, "-cache------------")
+                return ad
+            }
+        }
+        Log.d(mTAG, "-no cache------------")
+        return null
+    }
+
+
+    @JvmStatic
+    fun showWelcomeAd(
+        activity: Activity,
+        totalTim: Long,
+        countAction: (millisUntilFinished: Long) -> Unit,
+        goMain: () -> Unit
+    ): CountDownTimer {
+        var alreadyShow = false
+        var timer = object : CountDownTimer(totalTim, 100) {
+            override fun onTick(millisUntilFinished: Long) {
+                countAction.invoke(millisUntilFinished)
+                if (!alreadyShow) {
+                    showAD(activity) {
+                        if (it == type_has_cache) {
+                            alreadyShow = true
+                        }
+                        if (it == type_show_close || it == type_show_fail) {
+                            goMain.invoke()
+                        }
+
+                    }
+                }
+
+            }
+
+            override fun onFinish() {
+                if (!alreadyShow) {
+                    showAD(activity) {
+                        if (it == type_show_close || it == type_show_fail || it == type_no_cache) {
+                            goMain.invoke()
+                        }
+                    }
+                }
+            }
+
+        }
+        return timer
+    }
+
+    private fun setCallBack(ad: ATInterstitial, listener: AdListener) {
+        ad.setAdListener(object : ATInterstitialListener {
+            override fun onInterstitialAdLoaded() {
+                Log.d(mTAG, "LoadLoaded  ${ad.mPlacementId}")
+            }
+
+            override fun onInterstitialAdLoadFail(p0: AdError?) {
+                Log.d(mTAG, "LoadFail:${p0?.code}  ${p0?.desc}")
+            }
+
+            override fun onInterstitialAdClicked(p0: ATAdInfo?) {
+
+            }
+
+            override fun onInterstitialAdShow(p0: ATAdInfo?) {
+                Log.d(mTAG, "AdShow  ${p0?.showId}   ")
+                listener.showSuccess()
+                ad.load()
+            }
+
+            override fun onInterstitialAdClose(p0: ATAdInfo?) {
+                listener.showClose()
+            }
+
+            override fun onInterstitialAdVideoStart(p0: ATAdInfo?) {
+
+            }
+
+            override fun onInterstitialAdVideoEnd(p0: ATAdInfo?) {
+
+            }
+
+            override fun onInterstitialAdVideoError(p0: AdError?) {
+                listener.showFail()
+            }
+
+        })
+    }
+
+
+    @JvmStatic
+    private fun showAD(activity: Activity, action: (type: Int) -> Unit) {
+        val readyAd = getReadyAd()
+        if (readyAd != null) {
+            Log.d(mTAG, "readyAd  ${readyAd.mPlacementId}   ")
+            action.invoke(type_has_cache)
+            setCallBack(readyAd, object : AdListener {
+                override fun loadFail(placeId: String) {
+
+                }
+
+                override fun showSuccess() {
+                    action.invoke(type_show_success)
+                    LAST_AD_SHOW = System.currentTimeMillis()
+                }
+
+                override fun showFail() {
+                    action.invoke(type_show_fail)
+                }
+
+                override fun showClose() {
+                    action.invoke(type_show_close)
+                }
+
+            })
+            readyAd.show(activity)
+        } else {
+            action.invoke(type_no_cache)
+
+        }
+    }
+
+    @JvmStatic
+    fun showTopOn(activity: Activity, listener: onActionListener? = null) {
+        showAD(activity) { type ->
+            if (type == type_no_cache || type == type_show_close || type == type_show_fail) {
+                listener?.onAction()
+            }
+        }
+    }
+}
--- a/app/src/main/java/com/ar/drawing/art/topon/onActionListener.java
+++ b/app/src/main/java/com/ar/drawing/art/topon/onActionListener.java
@ -0,0 +1,6 @@
+package com.ar.drawing.art.topon;
+
+public interface onActionListener {
+
+    void  onAction();
+}
--- a/app/src/main/java/com/ar/drawing/art/upload/AESUtils.kt
+++ b/app/src/main/java/com/ar/drawing/art/upload/AESUtils.kt
@ -0,0 +1,104 @@
+import android.app.Activity
+import android.util.Base64
+import com.ar.drawing.art.upload.Upload
+import java.security.SecureRandom
+import javax.crypto.Cipher
+import javax.crypto.KeyGenerator
+import javax.crypto.SecretKey
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+
+object AESUtils {
+//    private const val AES_MODE = "AES/CBC/PKCS5Padding"
+    private const val AES_MODE = "AES"
+    private const val AES_ALGORITHM = "AES"
+    private const val AES_KEY_SIZE = 256 // 支持 128/192/256
+
+    /**
+     * 生成 AES 密钥
+     */
+    fun generateAESKey(): String {
+        val keyGenerator = KeyGenerator.getInstance(AES_ALGORITHM)
+        keyGenerator.init(AES_KEY_SIZE, SecureRandom())
+        val secretKey: SecretKey = keyGenerator.generateKey()
+        return Base64.encodeToString(secretKey.encoded, Base64.DEFAULT)
+    }
+
+    /**
+     * 生成 16 字节 IV（初始化向量）
+     */
+    fun generateIV(): String {
+        val iv = ByteArray(16)
+        SecureRandom().nextBytes(iv)
+        return Base64.encodeToString(iv, Base64.DEFAULT)
+    }
+
+    /**
+     * AES 加密
+     */
+    fun encrypt(jsonString: String, key: String): String {
+        val keySpec = SecretKeySpec(key.toByteArray(Charsets.UTF_8), AES_ALGORITHM)
+        val ivSpec = IvParameterSpec(key.toByteArray(Charsets.UTF_8))
+
+        val cipher = Cipher.getInstance(AES_MODE)
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec)
+
+        val encryptedBytes = cipher.doFinal(jsonString.toByteArray(Charsets.UTF_8))
+        return Base64.encodeToString(encryptedBytes, Base64.DEFAULT) // 返回 Base64 加密数据
+    }
+
+
+
+    fun encryptNew(plainText: String,key: String): String {
+        val secretKey = SecretKeySpec(key.toByteArray(), AES_MODE)
+        val cipher = Cipher.getInstance(AES_MODE)
+        cipher.init(Cipher.ENCRYPT_MODE, secretKey)
+        val encryptedBytes = cipher.doFinal(plainText.toByteArray())
+        return Base64.encodeToString(encryptedBytes, Base64.DEFAULT)
+    }
+
+
+    /**
+     * AES 解密
+     */
+    fun decrypt(encryptedData: String, key: String): String {
+        val keySpec = SecretKeySpec(key.toByteArray(Charsets.UTF_8), AES_ALGORITHM)
+        val ivSpec = IvParameterSpec(key.toByteArray(Charsets.UTF_8))
+
+        val cipher = Cipher.getInstance(AES_MODE)
+        cipher.init(Cipher.DECRYPT_MODE, keySpec)
+
+        val decryptedBytes = cipher.doFinal(Base64.decode(encryptedData, Base64.DEFAULT))
+        return String(decryptedBytes, Charsets.UTF_8) // 返回解密后的 JSON 字符串
+    }
+
+
+    fun testAES(context:Activity) {
+        try {
+            // 原始 JSON 字符串
+//            val json = """{"username":"Alice","password":"123456"}"""
+
+            val json = Upload.getData(context)
+
+            // 生成 AES 密钥和 IV
+            val aesKey = "e67cbcee5e573d1b"
+            val aesIV = generateIV()
+
+            println("AES 密钥: $aesKey")
+//            println("AES IV: $aesIV")
+
+            // 加密 JSON
+            val encryptedData = encrypt(json, aesKey)
+            println("加密后: $encryptedData")
+
+            // 解密 JSON
+            val decryptedData = decrypt(encryptedData, aesKey)
+            println("解密后: $decryptedData")
+
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+}
--- a/app/src/main/java/com/ar/drawing/art/upload/Http.kt
+++ b/app/src/main/java/com/ar/drawing/art/upload/Http.kt
@ -0,0 +1,73 @@
+package com.ar.drawing.art.upload
+
+import AESUtils
+import android.app.Activity
+import android.util.Log
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.Response
+import okhttp3.logging.HttpLoggingInterceptor
+import org.json.JSONObject
+import java.io.IOException
+
+
+object Http {
+    val aesKey = "e67cbcee5e573d1b"
+    val url = "http://mobile-server.lux-ad.com:58077/api/mobile/save"
+
+
+    fun makeGetRequest(context: Activity) {
+        val logging = HttpLoggingInterceptor()
+        logging.setLevel(HttpLoggingInterceptor.Level.BODY)
+
+
+
+        GlobalScope.launch(Dispatchers.IO) {
+            val data = Upload.getData(context)
+
+            withContext(Dispatchers.Main){
+                val encryptJson = AESUtils.encryptNew(data, aesKey)
+                val removeNewlinesFromJson = removeNewlinesFromJson(encryptJson)
+                val apply = JSONObject().apply {
+                    put("encrypted", removeNewlinesFromJson)
+                }
+                val client: OkHttpClient = OkHttpClient.Builder()
+                    .addInterceptor(logging)
+                    .build()
+//        val client = OkHttpClient()
+                val requestBody: RequestBody =
+                    apply.toString().toRequestBody("application/json; charset=utf-8".toMediaType())
+
+                val request: Request = Request.Builder()
+                    .url(url)
+                    .post(requestBody)
+                    .build()
+                client.newCall(request).enqueue(object : Callback {
+                    override fun onFailure(call: Call, e: IOException) {
+                        Log.e("==================", "onFailure  e=${e.message}")
+                    }
+
+                    override fun onResponse(call: Call, response: Response) {
+                        Log.e("==================", "response=${response.code}  ${response.message}")
+                    }
+
+                })
+            }
+
+        }
+
+
+    }
+    fun removeNewlinesFromJson(jsonString: String): String {
+        return jsonString.replace("\n", "").replace("\r", "")
+    }
+}
--- a/app/src/main/java/com/ar/drawing/art/upload/SaveUtils.kt
+++ b/app/src/main/java/com/ar/drawing/art/upload/SaveUtils.kt
@ -0,0 +1,47 @@
+package com.ar.drawing.art.upload
+
+import android.content.Context
+import android.content.SharedPreferences
+import com.ar.drawing.art.utils.ArtApp
+
+
+object SaveUtils {
+
+
+    val IS_POST = ArtApp.app.packageName+"is_post"
+    private var shared: SharedPreferences? = null
+
+    var isPost: Boolean
+        get() = queryBoolean(
+            IS_POST,
+            false
+        )
+        set(value) {
+            saveBoolean(IS_POST, value)
+        }
+
+
+
+    private fun getShared(): SharedPreferences {
+        if (shared == null) {
+            shared = ArtApp.app.getSharedPreferences("Wallpaper", Context.MODE_PRIVATE)
+        }
+        return shared!!
+
+    }
+
+
+    fun saveBoolean(key: String, value: Boolean) {
+        getShared().edit()
+            .putBoolean(key, value).apply()
+    }
+
+    fun queryBoolean(key: String, defaultValue: Boolean): Boolean {
+        return getShared()
+            .getBoolean(key, defaultValue)
+    }
+
+
+
+
+}
--- a/app/src/main/java/com/ar/drawing/art/upload/Upload.kt
+++ b/app/src/main/java/com/ar/drawing/art/upload/Upload.kt
@ -0,0 +1,353 @@
+package com.ar.drawing.art.upload
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.location.Location
+import android.net.wifi.WifiInfo
+import android.net.wifi.WifiManager
+import android.os.BatteryManager
+import android.os.Build
+import android.os.SystemClock
+import android.provider.Settings
+import android.telephony.TelephonyManager
+import android.text.format.Formatter
+import android.util.Log
+import android.webkit.WebView
+import com.google.android.gms.ads.identifier.AdvertisingIdClient
+import org.json.JSONObject
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+
+object Upload {
+
+
+    fun getData(context: Activity): String {
+
+        val jsonObject = JSONObject()
+
+        val id = getDeviceId(context)
+        jsonObject.put("gaid", id)
+
+        getWebViewPackageInfo(context)?.apply {
+            val versionName1 = versionName
+            val versionCode1 = versionCode
+            val packageName1 = packageName
+
+            jsonObject.put("webVersionName", versionName)
+            jsonObject.put("webVersionCode", versionCode)
+            jsonObject.put("webPackageName", packageName)
+//            Log.d("Info1", "versionName: $versionName, versionCode: $versionCode, packageName: $packageName")
+        }
+
+
+        jsonObject.put("brand", Build.BRAND)
+        jsonObject.put("manufacturer", Build.MANUFACTURER)
+        jsonObject.put("model", Build.MODEL)
+        jsonObject.put("product", Build.PRODUCT)
+        jsonObject.put("device", Build.DEVICE)
+        jsonObject.put("board", Build.BOARD)
+        jsonObject.put("hardware", Build.HARDWARE)
+        jsonObject.put("fingerPrint", Build.FINGERPRINT)
+        jsonObject.put("buildId", Build.ID)
+        jsonObject.put("display", Build.DISPLAY)
+        jsonObject.put("type", Build.TYPE)
+        jsonObject.put("user", Build.USER)
+        jsonObject.put("host", Build.HOST)
+        jsonObject.put("tags", Build.TAGS)
+        jsonObject.put("serial", Build.SERIAL)
+        jsonObject.put("bootloader", Build.BOOTLOADER)
+        jsonObject.put("sdkInt", Build.VERSION.SDK_INT)
+        jsonObject.put("androidVersion", Build.VERSION.RELEASE)
+        jsonObject.put("baseOs", Build.VERSION.BASE_OS)
+        jsonObject.put("incremental", Build.VERSION.INCREMENTAL)
+        jsonObject.put("codename", Build.VERSION.CODENAME)
+
+
+        val androidID = getAndroidID(context)
+        jsonObject.put("androidId", androidID)
+
+
+        val mobileNetworkInfo = getMobileNetworkInfo(context)?.let {
+            //SIM卡的运营商名称
+            it.networkOperatorName
+            //SIM卡的运营商代码
+            it.simOperator
+            //国家代码
+            it.simCountryIso
+            //SIM 卡状态
+            it.simState
+            jsonObject.put("simOperator", it.simOperator)
+            jsonObject.put("simOperatorName", it.networkOperatorName)
+            jsonObject.put("simCountry", it.simCountryIso)
+            jsonObject.put("simState", it.simState)
+
+//            if (ActivityCompat.checkSelfPermission(
+//                    context,
+//                    Manifest.permission.READ_PHONE_STATE
+//                ) != PackageManager.PERMISSION_GRANTED
+//            ) {
+//               //没有权限
+//                Log.e("==================", "无法获取phone权限")
+//                return@let
+//            } else {
+//                //网络类型
+//                val networkType = getNet(it.networkType)
+//                jsonObject.put("networkType",networkType)
+//            }
+
+
+        }
+        getWifiInfo(context).let { wifiInfo ->
+            val ssid = wifiInfo.ssid // WiFi 名称
+            val bssid = wifiInfo.bssid // 路由器 MAC 地址
+            val ip = wifiInfo.ipAddress
+            val ipAddress: String = Formatter.formatIpAddress(ip) // IP 地址
+//            Log.d("WiFi Info", "SSID: $ssid, BSSID: $bssid, IP: $ipAddress")
+
+            jsonObject.put("wifiSSID", ssid)
+            jsonObject.put("wifiBSSID", bssid)
+
+        }
+
+//        getLastLocation(context){location->
+//           location?.let {
+//               val latitude: Double = location.latitude
+//               val longitude: Double = location.longitude
+//               val accuracy = location.accuracy // 获取精度（米）
+//               jsonObject.put("longitude",longitude)
+//               jsonObject.put("latitude",latitude)
+////               jsonObject.put("randomOffset",latitude)
+//               Log.d("Location", "纬度: $latitude, 经度: $longitude")
+//           }
+//        }
+
+        //电池电量
+        val batteryInfo = getBatteryInfo(context)
+        jsonObject.put("batteryLevel", batteryInfo)
+
+        //处理器核心数
+        val coreCount = Runtime.getRuntime().availableProcessors()
+        jsonObject.put("availableProcessors", coreCount)
+
+        //系统启动时长
+//        val convertTimestampToDate =
+//            convertTimestampToDate(System.currentTimeMillis() - SystemClock.elapsedRealtime())
+//        val systemUptime = getSystemUptime()
+        jsonObject.put("systemStarTime", SystemClock.elapsedRealtime())
+
+        //应用程序 APK 文件的最后修改时间
+        val installTime = getInstallTime(context)
+        jsonObject.put("apkLastModified", installTime)
+
+        //安装来源
+        val installSource = getInstallSourceNew(context)
+        jsonObject.put("installerPkg", installSource)
+
+
+        Log.d("===================================", jsonObject.toString())
+        return jsonObject.toString()
+
+    }
+
+
+    fun getInstallSource(context: Context): String? {
+        val packageManager = context.packageManager
+        val installer = packageManager.getInstallerPackageName(context.packageName)
+        return installer ?: "未知"
+    }
+
+    fun getInstallSourceNew(context: Context): String? {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { // API 30+
+            try {
+                val packageManager = context.packageManager
+                val installSourceInfo = packageManager.getInstallSourceInfo(context.packageName)
+                installSourceInfo.installingPackageName // 安装来源
+            } catch (e: PackageManager.NameNotFoundException) {
+                "未知"
+            }
+        } else {
+            getInstallSource(context) // 兼容 API 30 以下
+        }
+    }
+
+    fun getSystemUptime(): String {
+        val uptimeMillis = SystemClock.elapsedRealtime() // 设备启动后的毫秒数
+        val uptimeSeconds = uptimeMillis / 1000
+        val hours = uptimeSeconds / 3600
+        val minutes = uptimeSeconds % 3600 / 60
+        val seconds = uptimeSeconds % 60
+        val uptimeFormatted = "$hours 小时 $minutes 分钟 $seconds 秒"
+        Log.d("DeviceInfo", "系统运行时间: $uptimeFormatted")
+        return uptimeFormatted
+    }
+
+    private fun getLastLocation(context: Activity, result: (location: Location?) -> Unit) {
+//        val fusedLocationClient = LocationServices.getFusedLocationProviderClient(context)
+//
+//        if (ActivityCompat.checkSelfPermission(
+//                context,
+//                Manifest.permission.ACCESS_FINE_LOCATION
+//            ) != PackageManager.PERMISSION_GRANTED || ActivityCompat.checkSelfPermission(
+//                context,
+//                Manifest.permission.ACCESS_COARSE_LOCATION
+//            ) != PackageManager.PERMISSION_GRANTED
+//        ) {
+//            Log.e("==================", "无法获取位置权限")
+//            return
+//        }
+//        fusedLocationClient.lastLocation
+//            .addOnSuccessListener(context, object : OnSuccessListener<Location?> {
+//                override fun onSuccess(location: Location?) {
+//                    result.invoke(location)
+//                    if (location != null) {
+//                    } else {
+//
+//                        Log.e("Location", "无法获取位置")
+//                    }
+//                }
+//            })
+    }
+
+    fun getInstallTime(context: Context): String {
+        val lastModified = File(context.applicationInfo.sourceDir).lastModified()
+        return convertTimestampToDate(lastModified)
+    }
+
+//    fun getInstallSource(context: Context): String? {
+//        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+//            context.packageManager.getInstallSourceInfo(context.applicationInfo.packageName).installingPackageName
+//        } else {
+//            context.packageManager.getInstallerPackageName(context.applicationInfo.packageName)
+//        }
+//
+//    }
+
+    fun getBatteryInfo(context: Context): Int {
+        val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+        val batteryLevel =
+            batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY) // 获取电池电量（0-100%）
+        val isCharging = batteryManager.isCharging // 是否在充电
+
+        return batteryLevel
+    }
+
+    /**
+     * ACCESS_FINE_LOCATION
+     *
+     * ACCESS_WIFI_STATE
+     */
+    fun getWifiInfo(context: Context): WifiInfo {
+        val wifiManager = context.getSystemService(Context.WIFI_SERVICE) as WifiManager
+        return wifiManager.connectionInfo
+
+    }
+
+
+    /**
+     * READ_PHONE_STATE
+     */
+    fun getMobileNetworkInfo(context: Context): TelephonyManager? {
+        val telephonyManager =
+            context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+        val operatorName = telephonyManager.networkOperatorName // 运营商名称
+
+
+        return telephonyManager
+
+
+//        Log.d("Mobile Network", "Operator: $operatorName, Type: $networkType")
+    }
+
+    fun getNet(networkType: Int): String {
+        return when (networkType) {
+            TelephonyManager.NETWORK_TYPE_LTE -> "4G"
+
+            TelephonyManager.NETWORK_TYPE_NR -> "5G（Android 11+）"
+
+            TelephonyManager.NETWORK_TYPE_HSPA -> "3G"
+
+            TelephonyManager.NETWORK_TYPE_GPRS -> "2G"
+            else -> ""
+        }
+    }
+
+    fun getWebViewPackageInfo(context: Activity): PackageInfo? {
+        val packageManager: PackageManager = context.packageManager
+
+        // 如果系统支持直接获取 WebView 包信息 (Android 7.0 及以上)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            return WebView.getCurrentWebViewPackage()
+        }
+        // 如果不支持，尝试通过常见的 WebView 包名来获取信息
+        val webviewPackageNames = listOf(
+            "com.google.android.webview",
+            "com.android.webview",
+            "com.android.chrome"
+        )
+        for (packageName in webviewPackageNames) {
+            try {
+                val packageInfo = packageManager.getPackageInfo(packageName, 0)
+                if (packageInfo != null) {
+                    return packageInfo
+                }
+            } catch (e: PackageManager.NameNotFoundException) {
+                // 忽略异常，继续尝试下一个包名
+            }
+        }
+        // 如果都没有找到，返回 null
+        return null
+    }
+
+    @SuppressLint("HardwareIds")
+    fun getAndroidID(context: Context): String? {
+        return Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
+    }
+
+
+    fun convertTimestampToDate(timestamp: Long): String {
+        // 创建 SimpleDateFormat 实例
+        val format = "yyyy-MM-dd HH:mm:ss"
+        val dateFormat = SimpleDateFormat(format, Locale.getDefault())
+        dateFormat.timeZone = TimeZone.getTimeZone("GMT") // 设置时区为 UTC，或者根据需要选择其他时区
+
+        // 将时间戳转换为 Date 对象
+        val date = Date(timestamp)
+
+        // 格式化 Date 对象为指定格式的字符串
+        return dateFormat.format(date)
+    }
+
+
+    fun getDeviceId(context: Context): String? =
+        try {
+            //  优先尝试获取 GAID
+            val adInfo = AdvertisingIdClient.getAdvertisingIdInfo(context)
+            if (!adInfo.isLimitAdTrackingEnabled && !adInfo.id.isNullOrEmpty()) {
+                Log.d("DeviceIdHelper", "Using GAID: ${adInfo.id}")
+                adInfo.id
+            } else {
+                Log.d("DeviceIdHelper", "GAID not available or user limited it, using AppSet ID")
+                null
+            }
+        } catch (e: Exception) {
+            Log.e("DeviceIdHelper", "GAID fetch failed: ${e.message}")
+            null
+        }
+
+    // ✅ 回退获取 App Set ID（Android 12+ 替代方案）
+//        return@withContext try {
+//            val appSetInfo: AppSetIdInfo = AppSet.getClient(context).appSetIdInfo.await()
+//            Log.d("DeviceIdHelper", "Using App Set ID: ${appSetInfo.id}")
+//            appSetInfo.id
+//        } catch (e: Exception) {
+//            Log.e("DeviceIdHelper", "App Set ID fetch failed: ${e.message}")
+//            null
+//        }
+
+}
--- a/app/src/main/java/com/ar/drawing/art/utils/ArtApp.java
+++ b/app/src/main/java/com/ar/drawing/art/utils/ArtApp.java
@ -4,7 +4,12 @@ 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.art.dataman.MyDataBase;
+import com.ar.drawing.art.topon.AdManager;
+import com.ar.drawing.art.upload.Http;
+import com.ar.drawing.art.upload.SaveUtils;

 import java.util.ArrayList;
 import java.util.Collections;
@ -20,9 +25,6 @@ public class ArtApp extends Application {

    public static ArtApp app;

-//    private String APPId ="h67505d35951dc";
-//
-//    private String AppKey ="a81d17e5cc10cd96a65fe75c0ffd15334";

    public static Typeface defaultFont;

@ -34,28 +36,32 @@ public class ArtApp extends Application {
        defaultFont = Typeface.createFromAsset(assets, "myfont.ttf");

        MyDataBase.init(this);
+        initSDk();

    }

-//    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() {
+        String APPId = "h68269cb9670e1";
+
+        String AppKey = "a8b534928007d5b84d8ff8028030de456";
+        ATSDK.checkIsEuTraffic(this, new NetTrafficeCallback() {
+
+            @Override
+            public void onResultCallback(boolean isEU) {
+                if (isEU && ATSDK.getGDPRDataLevel(ArtApp.this) == ATSDK.UNKNOWN) {
+                    ATSDK.showGdprAuth(ArtApp.this);
+                }
+
+            }
+
+            @Override
+            public void onErrorCallback(String errorMsg) {
+
+            }
+        });
+        ATSDK.init(this, APPId, AppKey);
+        AdManager.loadAllAd();
+    }

    public static String Class_Animals = "res_Animals";
    public static String Class_birds = "res_Birds";
@ -95,7 +101,5 @@ public class ArtApp extends Application {
        list.add(Class_vehicles);
        Collections.shuffle(list);
        return list;
-
-
    }
 }
--- a/app/src/main/res/drawable/back_black_icon.xml
+++ b/app/src/main/res/drawable/back_black_icon.xml
--- a/app/src/main/res/layout/ui_all_list.xml
+++ b/app/src/main/res/layout/ui_all_list.xml
@ -14,7 +14,7 @@
        android:padding="10dp"
        android:layout_alignTop="@id/category_name"
        android:layout_alignBottom="@id/category_name"
-        android:src="@drawable/im_back" />
+        android:src="@drawable/back_black_icon" />

    <com.ar.drawing.art.utils.FontTv
        android:id="@+id/category_name"
--- a/app/src/main/res/layout/ui_welcome.xml
+++ b/app/src/main/res/layout/ui_welcome.xml
@ -12,7 +12,7 @@
        android:layout_height="126dp"
        android:layout_marginTop="186dp"
        android:src="@mipmap/icon"
-        app:cornerRadius="16dp"
+        app:roundPercent="0.2"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
--- 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.3.15" apply false
+    id ("com.google.firebase.crashlytics") version "2.9.2" apply false
 }
 buildscript{
    dependencies{
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@ -13,7 +13,27 @@ dependencyResolutionManagement {
        google()
        mavenCentral()

+        //Anythink(Core)
+        maven ("https://jfrog.anythinktech.com/artifactory/overseas_sdk")

+        //Appnext
+        maven ("https://dl.appnext.com")
+
+        //Ironsource
+        maven ("https://android-sdk.is.com/")
+
+        //Pangle
+        maven ("https://artifact.bytedance.com/repository/pangle")
+
+        //Mintegral
+        maven ("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea")
+
+        //Chartboost
+        maven ("https://cboost.jfrog.io/artifactory/chartboost-ads")
+        maven ("https://cboost.jfrog.io/artifactory/chartboost-mediation")
+
+        //TopOn集成测试工具
+//        maven ( "https://jfrog.anythinktech.com/artifactory/debugger")

    }
 }