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

@@ -9,28 +9,6 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.widget.TextView;
 
-import java.util.concurrent.LinkedBlockingQueue;
-
-
-/**
- * Accelerometer inherits some methods from abstract Detector class (more info there)
- *
- *
- * USE FROM MAIN ACTIVITY:
- *
- * Accelerometer beschleunigungssensor = new Accelerometer(this);
- * onCreate:
- * //Accelerometer Setup
- * beschleunigungssensor = new Accelerometer(this, logger, textViewLog);   //logger and textview only for debugging necessary
- * beschleunigungssensor.getSensor();
- *
- * //Starting Detection:
- * beschleunigungssensor.startDetection();
- * //Stopping Detection: also recommended at onPause to avoid unnecessary battery consumption
- * beschleunigungssensor.stopDetection();
- *
- * */
-
 public class Accelerometer extends Detector implements SensorEventListener {
 
     Logger logger;
@@ -45,18 +23,15 @@ public class Accelerometer extends Detector implements SensorEventListener {
     float z;
     float betrag; //Betrag aller drei Achsen sqrt(x*x + y*y + z*z)
     private DetectionReport detectionReport;
-    TextView textView;
+    TextView textViewLog;
-
-    //Queue for taking in values
-    LinkedBlockingQueue<Float> linkedBlockingQueue = new LinkedBlockingQueue<>();
 
 
     // In constructor pass Activity, Context and TextView from MainActivity in Accelerometer class
-    public Accelerometer(Context context, Logger mainLogger, TextView textView){
+    public Accelerometer(Context context, Logger mainLogger, TextView textViewLog){
         super(context); //von Detektor
         logger = mainLogger;
         this.context = context;
-        this.textView = this.textView;
+        this.textViewLog = textViewLog;
         //Logger logger = new Logger(this.getClass().getSimpleName(), textViewLog, "");
     }
 
@@ -72,44 +47,60 @@ public class Accelerometer extends Detector implements SensorEventListener {
         }
     }
 
+
+    void start() {
+        // register the sensor before using //
+        sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_NORMAL);
+        logger.log("Accelerometer, start!");
+    }
+
+
+    void stop() {
+        // unregister from the sensor to stop using it //
+        sensorManager.unregisterListener(this, accelerometer);
+        logger.log("Accelerometer unregistered!");
+    }
+
+
     @Override
     public void onSensorChanged(SensorEvent event) {
-        try {
+        checkAlarm(event);
-            checkAlarm(event);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     StringBuffer stringBuffer = new StringBuffer();
-
+    public void checkAlarm (SensorEvent event) {
-    public void checkAlarm (SensorEvent event) throws InterruptedException {
         x = event.values[0];
         y = event.values[1];
         z = event.values[2];
         betrag = (float) sqrt(x*x + y*y + z*z);
-        float threshold = 1.5F;
+        double schwelle = 1.5;
 
         if (!alarm) {
-            if (betrag > threshold) {
+            if (betrag > schwelle) {
+                stringBuffer.append("\n Betragswert über Schwelle, Detection Report wird gleich aufgerufen");
+                //logger.log("Betragswert über Schwelle erkannt, Alarm wird gleich angeschaltet");
                 alarm = true;
+                stringBuffer.append("\nAlarm = " + alarm);
                 detectionReport = new DetectionReport("Accelerometer1", "Bewegung", betrag);
-
+                stringBuffer.append("\nDetectionReport = " + detectionReport)
-                stringBuffer.append("\nDetectionReport = ").append(detectionReport).append("\nAlarm an");
+                        .append("\nAlarm an" + betrag + event.timestamp);
+                //logger.log("Alarm an");
+                //logger.log("Betrag: " + betrag + event.timestamp);
                 logger.clearLog();
                 logger.log(stringBuffer.toString());
                 stringBuffer.delete(0, stringBuffer.length());
             }
         } else {
-            if (betrag < threshold) {
+            if (betrag < schwelle) {
-                stringBuffer.append("\nAlarm noch an; Neuer Betragswert unter Schwellwert:").append(betrag);
+                stringBuffer.append("\nAlarm noch an; Neuer Betragswert unter Schwellwert:" + betrag);
                 //logger.log("Alarm ist noch an; Neuer Betragswert unter Schwellwert: " + betrag);
                 alarm = false;
                 //logger.log("Alarm" + alarm);
                 //logger.log("Alarm wieder ausgeschaltet");
-                stringBuffer.append("\nAlarm = ").append(alarm);
+                stringBuffer.append("\nAlarm = " + alarm);
             } else {
                 logger.log("Betragswert immer noch über Schwellwert: " + betrag + "; Alarm bleibt an.");
+                logger.log("Betragswert immer noch über Schwellwert: " + betrag + "; Alarm bleibt an.");
             }
             //logger.clearLog();
             logger.log(stringBuffer.toString());

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

@@ -16,11 +16,18 @@ import android.widget.ToggleButton;
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
     private Logger logger;
+    private Context context;
     private Accelerometer beschleunigungssensor;
+    //private ThreadDemo threadDemo;
     private TextView textViewLog;
     private Button button1;
+    private TextView textViewWorkerThread;
+    SensorEvent event;
+
     ToggleButton toggleButton1;
 
+    boolean currentAlarm;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -28,19 +35,20 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         setContentView(R.layout.activity_main);
 
         // Logger setup
-        textViewLog = findViewById(R.id.textViewLog);
+        textViewLog = (TextView) findViewById(R.id.textViewLog);
-        textViewLog.setMovementMethod(new ScrollingMovementMethod());
         logger = new Logger(this.getClass().getSimpleName(), textViewLog, "");
 
-        toggleButton1 = findViewById(R.id.toggleButton1); //togglebutton um Detektion zu steuern
+        toggleButton1 = (ToggleButton) findViewById(R.id.toggleButton1); //togglebutton um Thread zu steuern
         toggleButton1.setOnClickListener(this);
+        textViewWorkerThread = (TextView) findViewById(R.id.textViewWorkerThread); //TextView um Thread zu überwachen
+        textViewWorkerThread.setMovementMethod(new ScrollingMovementMethod());
 
         //Button to clear Log while Debugging
         button1 = (Button) findViewById(R.id.button1);
         button1.setOnClickListener(this);
 
         //Accelerometer Setup
-        beschleunigungssensor = new Accelerometer(this, logger, textViewLog);   //logger and textview only for debugging necessary
+        beschleunigungssensor = new Accelerometer(this, logger, textViewWorkerThread);
         beschleunigungssensor.getSensor();
 
         logger.log("onCreate");
@@ -71,7 +79,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 logger.log("Detection stopped");
             }
         } else if (v == button1) {
-            logger.clearLog(); //just to clear log manually if it's too full
+            logger.clearLog();
         }
     }
 }

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

@@ -1,63 +0,0 @@
-package com.example.ueberwachungssystem;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import java.util.concurrent.LinkedBlockingQueue;
-
-public class SensorValueThread implements Runnable {
-
-    private volatile boolean running = false;
-    private Thread thread;
-    private String threadname = "sensorValueThread";
-    Logger logger;
-    float x;
-    LinkedBlockingQueue<Float> linkedBlockingQueue;
-    //AppCompatActivity activity;
-
-    //Constructor muss die LinkedBlockingQueue übergeben bekommen
-    public SensorValueThread(LinkedBlockingQueue linkedBlockingQueue){
-        this.linkedBlockingQueue = linkedBlockingQueue;
-    }
-
-    @Override
-    public void run() {
-        while (running){
-            //Code to execute while running == true, i.e. reading queue and calculate sth.
-            try {
-                x = linkedBlockingQueue.take();
-
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    void start() {
-        logger.log("Starting " + threadname + "...");
-        running = true;
-        thread = new Thread(this);
-        thread.setName(threadname);
-        thread.start();
-        logger.log("..." + threadname + " started");
-    }
-
-    void stop() {
-        if (!running) {
-            logger.log(threadname + " not running");
-        } else {
-            logger.log("Stopping " + threadname + "...");
-            running = false;
-            while(true){
-                try {
-                    thread.join();
-                    logger.log("... " + threadname + " stopped");
-                    break;
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-}