Merge branch 'master' of gitlab.huolea.com:koko/file-recovery-recyclebin

app/src/main/java/com/base/filerecoveryrecyclebin/service/FileObserverExample.java

 package com.base.filerecoveryrecyclebin.service;
 
+import static android.os.FileObserver.ALL_EVENTS;
+import static android.os.FileObserver.MOVED_FROM;
+
 import android.os.Build;
 import android.os.Environment;
 import android.os.FileObserver;
@@ -50,7 +53,7 @@ public class FileObserverExample {
         fileHandlerThread = new HandlerThread("FileObserverThread");
         fileHandlerThread.start();
         fileHandler = new Handler(fileHandlerThread.getLooper());
-        fileObserver = new FileObserver(watchList, FileObserver.CREATE | FileObserver.DELETE) {
+        fileObserver = new FileObserver(watchList, FileObserver.CREATE | FileObserver.DELETE | FileObserver.DELETE_SELF | FileObserver.MOVED_FROM) {
             @Override
             public void onEvent(int event, String path) {
                 Log.d(TAG, "onEvent " + event + "  " + path);
@@ -61,7 +64,7 @@ public class FileObserverExample {
             }
         };
         fileObserver.startWatching(); // 启动观察
-        Log.d(TAG,"startObserving");
+        Log.d(TAG, "startObserving");
     }
 
     public void stopObserving() {
@@ -73,14 +76,14 @@ public class FileObserverExample {
 
     // 处理文件事件
     private void handleFileEvent(String path, int event) {
-        Log.d(TAG, path);
+        Log.d(TAG, event + "    " + FileObserver.DELETE_SELF + "   " + path);
         // 检查文件扩展名是否在监听范围内
         if (FILE_EXTENSIONS.contains(getFileExtension(path))) {
             if (event == FileObserver.CREATE) {
                 Log.d(TAG, "CREATE");
                 fileHandler.post(() -> handleFileCreation(path));
-            } else if (event == FileObserver.DELETE) {
-                Log.d(TAG, "DELETE:" + path);
+            } else if (event == FileObserver.DELETE || event == FileObserver.DELETE_SELF || event == FileObserver.MOVED_FROM) {
+                Log.d(TAG, event + " DELETE:" + path);
                 BackUpUtils.INSTANCE.deleteFile(path);
             }
         }

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

@@ -66,7 +66,7 @@ class StayNotificationService : Service() {
         if(fileObserver == null){
             fileObserver = FileObserverExample()
             fileObserver?.startObserving()
-        }
+                    }
         if (!isRunning) {
             val notification = createPermanentNotification(applicationContext)
             startForeground(1, notification)