...大通知取消

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -24,7 +24,7 @@
         android:roundIcon="@mipmap/logo"
         android:supportsRtl="true"
         android:theme="@style/Theme.DataRecovery"
-        tools:targetApi="34" >
+        tools:targetApi="34">
         <activity
             android:name=".activity.screenshot.ScreenShotAnimationActivity"
             android:exported="false"
@@ -39,7 +39,7 @@
             android:name=".activity.SplashActivity"
             android:exported="true"
             android:launchMode="singleTask"
-            android:theme="@style/splash.theme" >
+            android:theme="@style/splash.theme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -176,16 +176,18 @@
 
         <service
             android:name=".fcm.MessagingService"
-            android:exported="true" >
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
-        </service> <!-- 添加以下接收器 -->
+        </service>
+
+        <!-- 添加以下接收器 -->
         <!-- 注册广播 -->
         <receiver
             android:name=".fcm.FcmReceiver"
             android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND" >
+            android:permission="com.google.android.c2dm.permission.SEND">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
@@ -193,6 +195,11 @@
                 <category android:name="com.test.easy.cleanerjunk" />
             </intent-filter>
         </receiver>
+
+        <receiver
+            android:name=".fcm.CloseNotificationReceiver"
+            android:exported="false" />
+
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/base/datarecovery/activity/ResultActivity.kt

@@ -9,7 +9,7 @@ import com.base.datarecovery.R
 import com.base.datarecovery.activity.junkclean.ScanJunkActivity
 import com.base.datarecovery.activity.privacyspace.PrivacyPinOneActivity
 import com.base.datarecovery.activity.privacyspace.PrivacySpaceActivity
-import com.base.datarecovery.activity.recovery.FileScanActivity
+import com.base.datarecovery.activity.recovery.FileScanResultActivity
 import com.base.datarecovery.activity.repeat.RepeatAnimationActivity
 import com.base.datarecovery.activity.screenshot.ScreenShotAnimationActivity
 import com.base.datarecovery.adapter.AppFunctionAdapter
@@ -59,20 +59,20 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
                 }
 
                 RECOVERY_PHOTOS -> {
-                    startActivity(Intent(this, FileScanActivity::class.java).apply {
-                        putExtra("Type", SCAN_PHOTOS)
+                    startActivity(Intent(this, FileScanResultActivity::class.java).apply {
+                        putExtra("ScanType", SCAN_PHOTOS)
                     })
                 }
 
                 RECOVERY_VIDEOS -> {
-                    startActivity(Intent(this, FileScanActivity::class.java).apply {
-                        putExtra("Type", SCAN_VIDEOS)
+                    startActivity(Intent(this, FileScanResultActivity::class.java).apply {
+                        putExtra("ScanType", SCAN_VIDEOS)
                     })
                 }
 
                 RECOVERY_DOCUMENTS -> {
-                    startActivity(Intent(this, FileScanActivity::class.java).apply {
-                        putExtra("Type", SCAN_DOCUMENTS)
+                    startActivity(Intent(this, FileScanResultActivity::class.java).apply {
+                        putExtra("ScanType", SCAN_DOCUMENTS)
                     })
                 }
 

app/src/main/java/com/base/datarecovery/fcm/CloseNotificationReceiver.kt

@@ -5,22 +5,30 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.base.datarecovery.utils.AppPreferences
+import com.base.datarecovery.utils.LogEx
 
 class CloseNotificationReceiver : BroadcastReceiver() {
+
+    private val TAG = "CloseNotificationReceiver"
+
     companion object {
         var Action = "CANCEL_NOTIFICATION"
         var NotificationId = "NOTIFICATION_ID"
     }
 
     override fun onReceive(context: Context?, intent: Intent?) {
-        val action = intent?.action
+        LogEx.logDebug(TAG, "onReceive")
+        val action = intent?.action ?: ""
         NotificationUtil.stopNotificationHandler()
-        if (action != null && action == "CANCEL_NOTIFICATION") {
-            var notificationId = intent.getIntExtra(NotificationId, 0)
+        if (action == "CANCEL_NOTIFICATION") {
+            var notificationId = intent?.extras?.getInt(NotificationId, 0) ?: 0
+            LogEx.logDebug(TAG, "notificationId=$notificationId")
             val notificationManager = context!!.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-            val actionS: Int = AppPreferences.getInstance().getInt("actionS", 0)
-            if (actionS == 0) {
-                notificationId = 0
+            val actionS = AppPreferences.getInstance().getString("actionS", "0") ?: "0"
+            runCatching {
+                if (actionS.toInt() == 0) {
+                    notificationId = 0
+                }
             }
             notificationManager.cancel(notificationId)
         }

app/src/main/java/com/base/datarecovery/fragment/HomeFragment.kt

@@ -6,7 +6,6 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
-import com.base.datarecovery.activity.recovery.FileScanActivity
 import com.base.datarecovery.activity.SettingActivity
 import com.base.datarecovery.activity.junkclean.ScanJunkActivity
 import com.base.datarecovery.activity.privacyspace.PrivacyPinOneActivity
@@ -15,11 +14,13 @@ import com.base.datarecovery.activity.recovery.FileScanResultActivity
 import com.base.datarecovery.activity.repeat.RepeatAnimationActivity
 import com.base.datarecovery.activity.screenshot.ScreenShotAnimationActivity
 import com.base.datarecovery.ads.AdmobNativeUtils
+import com.base.datarecovery.bean.ConstObject
 import com.base.datarecovery.bean.ConstObject.SCAN_DOCUMENTS
 import com.base.datarecovery.bean.ConstObject.SCAN_PHOTOS
 import com.base.datarecovery.bean.ConstObject.SCAN_VIDEOS
 import com.base.datarecovery.bean.ConstObject.privacyPinPassword
 import com.base.datarecovery.databinding.FragmentHomeBinding
+import com.base.datarecovery.fcm.NotificationUtil.sendNotification
 import com.base.datarecovery.help.BaseFragment
 
 class HomeFragment : BaseFragment<FragmentHomeBinding>() {
@@ -36,7 +37,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
 
     override fun setListener() {
         binding.flScan.setOnClickListener {
-            startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
+//            startActivity(Intent(requireContext(), ScanJunkActivity::class.java))
+            sendNotification(requireContext(), ConstObject.ID_JUNK_CLEAN_PUSH)
         }
         binding.flRyPhoto.setOnClickListener {
             startActivity(Intent(requireContext(), FileScanResultActivity::class.java).apply {

app/src/main/java/com/base/datarecovery/service/StayNotificationService.kt

@@ -20,6 +20,7 @@ import com.base.datarecovery.R
 import com.base.datarecovery.activity.MainActivity
 import com.base.datarecovery.activity.junkclean.ScanJunkActivity
 import com.base.datarecovery.activity.recovery.FileScanActivity
+import com.base.datarecovery.activity.recovery.FileScanResultActivity
 import com.base.datarecovery.bean.ConstObject.SCAN_DOCUMENTS
 import com.base.datarecovery.bean.ConstObject.SCAN_PHOTOS
 import com.base.datarecovery.bean.ConstObject.SCAN_VIDEOS
@@ -92,8 +93,8 @@ class StayNotificationService : Service() {
         expendView.setOnClickPendingIntent(R.id.id_ll_clean, pendingIntent0)
 
         val requestCode2 = Random.nextInt(1800)
-        val intent2 = Intent(context, FileScanActivity::class.java).apply {
-            putExtra("Type", SCAN_PHOTOS)
+        val intent2 = Intent(context, FileScanResultActivity::class.java).apply {
+            putExtra("ScanType", SCAN_PHOTOS)
         }
         val pendingIntent2 =
             PendingIntent.getActivity(context, requestCode2, intent2, PendingIntent.FLAG_IMMUTABLE)
@@ -101,8 +102,8 @@ class StayNotificationService : Service() {
         expendView.setOnClickPendingIntent(R.id.id_recovery_photos, pendingIntent2)
 
         val requestCode3 = Random.nextInt(1800)
-        val intent3 = Intent(context, FileScanActivity::class.java).apply {
-            putExtra("Type", SCAN_VIDEOS)
+        val intent3 = Intent(context, FileScanResultActivity::class.java).apply {
+            putExtra("ScanType", SCAN_VIDEOS)
         }
         val pendingIntent3 =
             PendingIntent.getActivity(context, requestCode3, intent3, PendingIntent.FLAG_IMMUTABLE)
@@ -118,8 +119,8 @@ class StayNotificationService : Service() {
 //        expendView.setOnClickPendingIntent(R.id.id_screenshot, pendingIntent4)
 
         val requestCode4 = Random.nextInt(1800)
-        val intent4 = Intent(context, FileScanActivity::class.java).apply {
-            putExtra("Type", SCAN_DOCUMENTS)
+        val intent4 = Intent(context, FileScanResultActivity::class.java).apply {
+            putExtra("ScanType", SCAN_DOCUMENTS)
         }
         val pendingIntent4 =
             PendingIntent.getActivity(context, requestCode4, intent4, PendingIntent.FLAG_IMMUTABLE)