修改崩溃，继承ump

app/build.gradle

@@ -116,7 +116,7 @@ dependencies {
     implementation 'com.google.android.ump:user-messaging-platform:2.1.0'
     implementation "com.squareup.okhttp3:okhttp:4.9.0"
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
-
+    implementation 'com.google.android.ump:user-messaging-platform:3.0.0'
 
 
 }
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
 
     <queries>
@@ -34,26 +35,21 @@
         tools:targetApi="34">
         <activity
             android:name=".activity.screenshot.ScreenShotAnimationActivity"
-            android:exported="false" />
+            android:screenOrientation="portrait" />
         <activity
             android:name=".activity.similarphotos.RepeatPhotoAnimationActivity"
-            android:exported="false" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".activity.largefile.LargeFileAnimationActivity"
-            android:exported="false" />
+          android:screenOrientation="portrait" />
         <activity
             android:name=".activity.batteryinfo.BatteryInfoAnimationActivity"
-            android:exported="false" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".activity.whatsapp.WhatsAppCleanerAnimationActivity"
-            android:exported="false"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
+            android:screenOrientation="portrait" />
         <activity
             android:name=".activity.appmanager.AppManagerAnimationActivity"
-            android:exported="false"
-            android:launchMode="singleTask"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
@@ -77,38 +73,26 @@
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".activity.appmanager.AppManagerActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".activity.whatsapp.WhatsAppCleanerActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".activity.whatsapp.WhatsAppMessageCleanActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".activity.screenshot.ScreenShotActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".activity.DeviceScanActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".activity.SettingActivity"
-            android:exported="false"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
@@ -135,8 +119,6 @@
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".activity.largefile.LargeFileCleanActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
@@ -145,14 +127,12 @@
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".activity.similarphotos.RepeatPhotoActivity"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity android:name=".activity.scanjunk.PrepareScanAt2"
             android:screenOrientation="portrait"/>
         <activity
             android:name=".activity.batteryinfo.BatteryInfoActivity"
-            android:launchMode="singleTop"
             android:screenOrientation="portrait"
             tools:ignore="DiscouragedApi,LockedOrientationActivity" />
 

app/src/main/java/com/test/easy/easycleanerjunk/MyApplication.kt

@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
 import com.facebook.FacebookSdk
-import com.google.android.gms.ads.MobileAds
 import com.test.easy.easycleanerjunk.activity.splash.NewSplashActivity
 import com.test.easy.easycleanerjunk.fcm.ActionBroadcast
 import com.test.easy.easycleanerjunk.fcm.FCMUtil
@@ -55,7 +54,7 @@ class MyApplication : BaseApplication() {
         FacebookSdk.sdkInitialize(this)
         initNotificationWork()
         InstallHelps.init {
-            MobileAds.initialize(this) { }
+         //  MobileAds.initialize(this) { }
         }
         BlackUtils.requestBlack()
         if (ConfigHelper.ifAgreePrivacy) {

app/src/main/java/com/test/easy/easycleanerjunk/activity/splash/NewSplashActivity.kt

@@ -8,6 +8,10 @@ import android.os.Build
 import android.os.Handler
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.isVisible
+import com.google.android.gms.ads.MobileAds
+import com.google.android.ump.ConsentInformation
+import com.google.android.ump.ConsentRequestParameters
+import com.google.android.ump.UserMessagingPlatform
 import com.test.easy.easycleanerjunk.databinding.ActivityLayoutSplashBinding
 import com.test.easy.easycleanerjunk.fcm.CloseNotificationReceiver
 import com.test.easy.easycleanerjunk.fcm.NotificationUtil
@@ -17,6 +21,7 @@ import com.test.easy.easycleanerjunk.helps.EventUtils
 import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
 import com.test.easy.easycleanerjunk.service.PermanentNotificationService.Companion.startNotification
 import com.test.easy.easycleanerjunk.utils.BarUtils
+import java.util.concurrent.atomic.AtomicBoolean
 
 @SuppressLint("CustomSplashScreen")
 class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
@@ -40,6 +45,7 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
 
     override fun initView() {
         initStatusBar()
+        initUmp()
         if (isDestroyed) {
             return
         }
@@ -47,6 +53,7 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
             finish()
             return
         }
+
         jumpType = intent.getIntExtra("actionId", 0)
         if (jumpType != 0) {
             val cancelIntent = Intent(this, CloseNotificationReceiver::class.java)
@@ -69,6 +76,42 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
         }
 
     }
+    private lateinit var consentInformation: ConsentInformation
+    private var isMobileAdsInitializeCalled = AtomicBoolean(false)
+    private fun initUmp(){
+        val params = ConsentRequestParameters
+            .Builder()
+            .build()
+        consentInformation = UserMessagingPlatform.getConsentInformation(this)
+        consentInformation.requestConsentInfoUpdate(
+            this,
+            params,
+            {
+                UserMessagingPlatform.loadAndShowConsentFormIfRequired(
+                    this
+                ) { loadAndShowError ->
+                    if (loadAndShowError != null) {
+                    }
+
+                    // Consent has been gathered.
+                    if (consentInformation.canRequestAds()) {
+                        initializeMobileAdsSdk()
+                    }
+                }
+            },
+            {
+
+            })
+        if (consentInformation.canRequestAds()) {
+            initializeMobileAdsSdk()
+        }
+    }
+    private fun initializeMobileAdsSdk(){
+        if (isMobileAdsInitializeCalled.getAndSet(true)) {
+            return
+        }
+        MobileAds.initialize(this) {}
+    }
 
     override fun onAgreePrivacy() {
         if (jumpType == 0) {

app/src/main/java/com/test/easy/easycleanerjunk/fcm/NotificationUtil.java

@@ -126,17 +126,14 @@ public class NotificationUtil {
             handler = new Handler(handlerThread.getLooper());
             for (int i = 1; i <= num; i++) {
                 final long time = i * delay;
-                handler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
+                handler.postDelayed(() -> {
                     if (MyApplication.PAUSED_VALUE == 1) {
+                        if (handler != null) {
                             handler.removeCallbacksAndMessages(null);
+                        }
                         return;
                     }
-                        if (MyApplication.PAUSED_VALUE != 1) {
                     sendNotification(context, actionId);
-                        }
-                    }
                 }, time);
             }
         }

app/src/main/java/com/test/easy/easycleanerjunk/service/PermanentNotificationService.kt

@@ -8,6 +8,7 @@ import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ServiceInfo
 import android.graphics.BitmapFactory
 import android.os.Build
 import android.os.IBinder
@@ -48,14 +49,14 @@ class PermanentNotificationService : Service() {
 
     @SuppressLint("ForegroundServiceType")
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (isRunning) {
-            stopSelf()
-            return START_NOT_STICKY
-        }
-
+        if (!isRunning) {
             val notification = createPermanentNotification(applicationContext)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            startForeground(10088, notification)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                startForeground(1, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+            } else {
+                startForeground(1, notification)
+            }
+            isRunning = true
         }
         return START_STICKY
     }