app/src/main/java/com/example/ueberwachungssystem/MainActivity.java

@@ -15,17 +15,13 @@ import androidx.lifecycle.LifecycleOwner;
 import android.Manifest;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.example.ueberwachungssystem.VideoDetection.DetectionReport;
-import com.example.ueberwachungssystem.VideoDetection.VideoDetector;
 import com.google.common.util.concurrent.ListenableFuture;
 
-import java.util.Calendar;
 import java.util.concurrent.ExecutionException;
 
 @ExperimentalGetImage
@@ -51,15 +47,8 @@ public class MainActivity extends AppCompatActivity {
 
         VideoDetector vd = new VideoDetector(this);
         vd.setPreviewView(previewView);
-        vd.setOnDetectionListener(new VideoDetector.OnDetectionListener() {
-            @Override
-            public void onDetection(DetectionReport detectionReport) {
-                Log.d("Listener", detectionReport.detectionType);
-            }
-        });
         vd.startDetection();
 
-
         previewButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

app/src/main/java/com/example/ueberwachungssystem/VideoDetection/DetectionReport.java

@@ -1,19 +0,0 @@
-package com.example.ueberwachungssystem.VideoDetection;
-
-import java.util.Calendar;
-
-/** Detection Report Class */
-
-public class DetectionReport {
-    public String timeStamp;
-    public String detectionType;
-    public float detectedAmplitude;
-    public String detectorID;
-
-    public DetectionReport(String detectorID, String detectionType, float detectedAmplitude) {
-        this.timeStamp = String.valueOf(Calendar.getInstance().getTime());
-        this.detectionType = detectionType;
-        this.detectedAmplitude = detectedAmplitude;
-        this.detectorID = detectorID;
-    }
-}

app/src/main/java/com/example/ueberwachungssystem/VideoDetector.java

@@ -1,4 +1,4 @@
-package com.example.ueberwachungssystem.VideoDetection;
+package com.example.ueberwachungssystem;
 
 import android.content.Context;
 import android.graphics.ImageFormat;
@@ -22,7 +22,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.nio.ByteBuffer;
 import java.util.concurrent.ExecutionException;
 
-
 @ExperimentalGetImage
 public class VideoDetector {
     // Calling Activity
@@ -33,36 +32,24 @@ public class VideoDetector {
     // Preview Camera Image
     private PreviewView previewView = null;
     // Check Violation
-    private final float DELTA_LUMINOSITY_THRESHOLD = 0.5f;
+    private final float DELTA_LUMINOSITY_THRESHOLD = 10f;
-    private float previousLuminosity = 0f;
+    private float lastLuminosity = 0f;
-    // On Detection Listener
+    private Boolean isViolated = false;
-    private OnDetectionListener listener;
-
 
 
     /** Constructor */
     public VideoDetector(Context context) { this.context = context; }
 
 
-    /** On Detection Listener - runs when a violation is reported */
-    public interface OnDetectionListener {
-        public void onDetection(DetectionReport detectionReport);
-    }
-    public void setOnDetectionListener(OnDetectionListener listener) {
-        this.listener = listener;
-    }
-    public void reportViolation(float amplitude) {
-        DetectionReport detectionReport = new DetectionReport("123", "Video", amplitude);
-        if (listener != null)
-            listener.onDetection(detectionReport);
-    }
-
 
     /** Return State of Video Detector */
-    public Boolean isRunning() {
+    public Boolean isRunning() { return isDetectionRunning; }
-        return isDetectionRunning;
-    }
 
+    /** Return the status of Violation */
+    public boolean getViolationStatus()
+    {
+        return isViolated;
+    }
 
     /** Starts Video Detection */
     public void startDetection() {
@@ -83,20 +70,17 @@ public class VideoDetector {
         },ContextCompat.getMainExecutor(context));
     }
 
-
     /** Stops Video Detection */
     public void stopDetection() {
         cameraProvider.unbindAll();
         isDetectionRunning = false;
     }
 
-
     /** Set PreviewView to show Image */
     public void setPreviewView(PreviewView previewView) {
         this.previewView = previewView;
     }
 
-
     /** Binds the Luminosity Analyzer (configure and run Analysis) */
     private void bindLuminosityAnalysis(@NonNull ProcessCameraProvider cameraProvider) {
         // Configure and create Image Analysis
@@ -116,8 +100,9 @@ public class VideoDetector {
                     // Analyze frame
                     float luminosity = calculateLuminosity(image);
                     Log.d("Video Detector", String.valueOf(luminosity));
-                    checkForViolation(luminosity, previousLuminosity);
+                    if (luminosity != 0)
-                    previousLuminosity = luminosity;
+                        checkForViolation(luminosity, lastLuminosity);
+                    lastLuminosity = luminosity;
                 }
                 imageProxy.close();
             }
@@ -133,7 +118,6 @@ public class VideoDetector {
         cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview);
     }
 
-
     /** Return Luminosity from Image */
     private float calculateLuminosity (Image image) {
         int width = image.getWidth();
@@ -158,12 +142,11 @@ public class VideoDetector {
         return sum / (width * height);
     }
 
-
     /** Check if delta Luminosity exceeds threshold */
     private void checkForViolation(float luminosity, float previousLuminosity) {
         float deltaLuminosity = Math.abs(luminosity - previousLuminosity);
         if (deltaLuminosity > DELTA_LUMINOSITY_THRESHOLD) {
-            reportViolation(deltaLuminosity);
+            isViolated = true;
             Log.d("Violation", "Violation");
         }
         Log.d("Delta", String.valueOf(Math.abs(previousLuminosity - luminosity)));