From d33ab299abc6daa5f2da8bbe43cf57f33733dcdd Mon Sep 17 00:00:00 2001
From: Leon Market <leon.market@mecuris.com>
Date: Tue, 20 Jun 2023 20:59:18 +0200
Subject: [PATCH] Added reportViolation()

---
 .../java/com/example/ueberwachungssystem/Accelerometer.java    | 3 +++
 .../main/java/com/example/ueberwachungssystem/Detector.java    | 2 +-
 .../java/com/example/ueberwachungssystem/MainActivity.java     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/example/ueberwachungssystem/Accelerometer.java b/app/src/main/java/com/example/ueberwachungssystem/Accelerometer.java
index 35db341..41cb708 100644
--- a/app/src/main/java/com/example/ueberwachungssystem/Accelerometer.java
+++ b/app/src/main/java/com/example/ueberwachungssystem/Accelerometer.java
@@ -47,6 +47,7 @@ public class Accelerometer extends Detector implements SensorEventListener {
     private DetectionReport detectionReport;
     TextView textView;
 
+
     //Queue for taking in values
     LinkedBlockingQueue<Float> linkedBlockingQueue = new LinkedBlockingQueue<>();
 
@@ -94,6 +95,7 @@ public class Accelerometer extends Detector implements SensorEventListener {
             if (betrag > threshold) {
                 alarm = true;
                 detectionReport = new DetectionReport("Accelerometer1", "Bewegung", betrag);
+                reportViolation("Accelo1", "Bewegung", betrag);
 
                 stringBuffer.append("\nDetectionReport = ").append(detectionReport).append("\nAlarm an");
                 logger.clearLog();
@@ -124,6 +126,7 @@ public class Accelerometer extends Detector implements SensorEventListener {
     @Override
     public void startDetection() {
         // entspricht void start()
+        getSensor();
         if (accelerometer != null) {
             sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
             logger.log("Sensor registriert");
diff --git a/app/src/main/java/com/example/ueberwachungssystem/Detector.java b/app/src/main/java/com/example/ueberwachungssystem/Detector.java
index d09fe1f..075e688 100644
--- a/app/src/main/java/com/example/ueberwachungssystem/Detector.java
+++ b/app/src/main/java/com/example/ueberwachungssystem/Detector.java
@@ -21,7 +21,7 @@ abstract public class Detector {
 
 
     /** Triggers onDetectionListener - call this to trigger violation/alarm */
-    private void reportViolation(String detectorID, String detectionType, float amplitude) {
+    public void reportViolation(String detectorID, String detectionType, float amplitude) {
         if (listener != null) {
             DetectionReport detectionReport = new DetectionReport(detectorID, detectionType, amplitude);
             listener.onDetection(detectionReport);
diff --git a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
index 1cd0a59..7639e61 100644
--- a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
+++ b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
@@ -41,7 +41,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
         //Accelerometer Setup
         beschleunigungssensor = new Accelerometer(this, logger, textViewLog);   //logger and textview only for debugging necessary
-        beschleunigungssensor.getSensor();
+        //beschleunigungssensor.getSensor();
 
         logger.log("onCreate");
     }