Added detection report

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

@@ -1,6 +1,6 @@
 package com.example.ueberwachungssystem;
 
-
+import static java.lang.Math.sqrt;
 
 import android.content.Context;
 import android.hardware.Sensor;
@@ -11,114 +11,129 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-
+public class Accelerometer extends Detector implements SensorEventListener {
-public class Accelerometer implements Runnable, SensorEventListener {
 
     Logger logger;
+
     private volatile boolean running = false;
     public SensorManager sensorManager;
-    private int sensorType = Sensor.TYPE_ACCELEROMETER;
+    private static final int sensorType = Sensor.TYPE_LINEAR_ACCELERATION;
     private Sensor accelerometer;
     private Context context;
-    private Thread thread;
-    private String threadName = "Accelerometer Thread";
-    double[] gravity = new double[3];
-    double[] linear_acceleration = new double[3];
-    private TextView textViewWorkerThread;
 
-    // In constructor pass Context from MainActivity in Accelerometer class
+    private String threadName = "Accelerometer Thread";
-    public Accelerometer(Context context, TextView textViewWorkerThread){
+    boolean alarm = false;
+    //Preallocate memory for the data of each axis of the acceleration sensor
+    float x;
+    float y;
+    float z;
+    float betrag; //Betrag aller drei Achsen sqrt(x*x + y*y + z*z)
+    private TextView textViewWorkerThread;
+    private AppCompatActivity activity;
+    private DetectionReport detectionReport;
+
+
+    // In constructor pass Activity, Context and TextView from MainActivity in Accelerometer class
+    public Accelerometer(Context context, Logger mainLogger, TextView textViewWorkerThread){
+        super(context); //von Detektor
+        logger = mainLogger;
         this.context = context;
         this.textViewWorkerThread = textViewWorkerThread;
-    }
+        Logger logger = new Logger(this.getClass().getSimpleName(), textViewWorkerThread, "");
-    // Passing Activity's instance as argument on worker thread
-    AppCompatActivity activity;
-    public Accelerometer(AppCompatActivity activity){
-        this.activity = activity;
     }
 
-    private void print (final String s){
+    public void getSensor(){
-        activity.runOnUiThread(new Runnable() {
+        sensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
-            @Override
+        if(sensorManager.getSensorList(sensorType).size()==0) {
-            public void run() {
+            logger.log("Es gibt den gewünschten Sensor nicht");
-                textViewWorkerThread.setText(s);
+            accelerometer = null;
-            }
+        }
-        });
+        else {
-    }
+            accelerometer = sensorManager.getSensorList(sensorType).get(0);
-
+            logger.log("Sensor gefunden");
-    @Override
-    public void run() {
-        while (running) {
-            sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-            if (sensorManager.getSensorList(sensorType).size() == 0) {
-                logger.log("Es gibt den gewünschten Sensor nicht");
-                accelerometer = null;
-            } else {
-                accelerometer = sensorManager.getSensorList(sensorType).get(0);
-            }
         }
     }
-    void start(){
-        logger.log("Starting" + threadName);
-        running = true;
-        thread = new Thread(this);
-        thread.setName(threadName);
-        thread.start();
-        logger.log("alright, " + threadName + " started!");
 
+
+    void start() {
         // register the sensor before using //
-        sensorManager.registerListener((SensorEventListener) context, accelerometer, SensorManager.SENSOR_DELAY_NORMAL);
+        sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
-        logger.log("Accelerometer, du bist dran!");
+        logger.log("Accelerometer, start!");
     }
 
+
     void stop() {
         // unregister from the sensor to stop using it //
-        sensorManager.unregisterListener((SensorEventListener) context, accelerometer);
+        sensorManager.unregisterListener(this, accelerometer);
-        logger.log("Das reicht Accelerometer, komm zurück!");
+        logger.log("Accelerometer unregistered!");
-        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();
-                }
-            }
-        }
     }
 
+
     @Override
     public void onSensorChanged(SensorEvent event) {
-        // Highpass filter to filter out gravity influence
+        checkAlarm(event);
-        final double alpha = 0.8;
+    }
 
-        gravity[0] = alpha * gravity[0] + (1 - alpha) * event.values[0];
+    StringBuffer stringBuffer = new StringBuffer();
-        gravity[1] = alpha * gravity[1] + (1 - alpha) * event.values[1];
+    public void checkAlarm (SensorEvent event) {
-        gravity[2] = alpha * gravity[2] + (1 - alpha) * event.values[2];
+        x = event.values[0];
-        linear_acceleration[0] = event.values[0] - gravity[0];
+        y = event.values[1];
+        z = event.values[2];
+        betrag = (float) sqrt(x*x + y*y + z*z);
+        double schwelle = 1.5;
+        //stringBuffer.append("\nBetrag =" + betrag);
+        //logger.log("Betrag" + betrag);
 
-        linear_acceleration[1] = event.values[1] - gravity[1];
+        if (!alarm) {
-        linear_acceleration[2] = event.values[2] - gravity[2];
+            if (betrag > schwelle) {
-
+                stringBuffer.append("\n Betragswert über Schwelle, Detection Report wird gleich aufgerufen");
-        String sb = "t=" + event.timestamp +
+                //logger.log("Betragswert über Schwelle erkannt, Alarm wird gleich angeschaltet");
-                "\nx=" + event.values[0] + // Wert liegend: x = 0.04
+                alarm = true;
-                "\ny=" + event.values[1] + // Wert liegend: y = 0.44
+                stringBuffer.append("\nAlarm = " + alarm);
-                "\nz=" + event.values[2] + // Wert liegend: z = 9.90 = Erdbeschleunigung --> Wenn Ausrichtung unbekannt ist, müsste kalibrierung bei Start der Bewegungsüberwachung vorgenommen werden
+                detectionReport = new DetectionReport("Accelerometer1", "Bewegung", betrag);
-                "\nlin_x=" + linear_acceleration[0] +
+                stringBuffer.append("\nDetectionReport = " + detectionReport)
-                "\nlin_x=" + linear_acceleration[1] +
+                            .append("\nAlarm an" + betrag + event.timestamp);
-                "\nlin_x=" + linear_acceleration[2];
+                //logger.log("Alarm an");
-
+                //logger.log("Betrag: " + betrag + event.timestamp);
-        logger.clearLog();
+                logger.clearLog();
-        logger.log(sb);
+                logger.log(stringBuffer.toString());
+                stringBuffer.delete(0, stringBuffer.length());
+            }
+        } else {
+            if (betrag < schwelle) {
+                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 = " + 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());
+            stringBuffer.delete(0, stringBuffer.length());
+        }
     }
 
     @Override
     public void onAccuracyChanged(Sensor sensor, int accuracy) {
+    }
 
+    @Override
+    public void startDetection() {
+        // entspricht void start()
+        if (accelerometer != null) {
+            sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
+            logger.log("Sensor registriert");
+        }
+    }
+
+    @Override
+    public void stopDetection() {
+        // entspricht void stop()
+        sensorManager.unregisterListener(this, accelerometer);
+        logger.log("Vom Sensor abgemeldet");
     }
 }

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

@@ -54,6 +54,7 @@ public class Beschleunigungssensor extends AppCompatActivity implements SensorEv
         else
         {
             sensor = sensorManager.getSensorList(sensorType).get(0);
+            logger.log("Accelerometer gefunden.");
         }
     }
 
@@ -89,7 +90,7 @@ public class Beschleunigungssensor extends AppCompatActivity implements SensorEv
         y = event.values[1];
         z = event.values[2];
         betrag = sqrt(x*x + y*y + z*z);
-        double schwelle = 1.5;
+        double schwelle = 0.05;
 
         if (!alarm) {
             if (betrag > schwelle) {

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

@@ -5,8 +5,11 @@ import static java.lang.Boolean.TRUE;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Context;
+import android.hardware.SensorEvent;
 import android.os.Bundle;
+import android.text.method.ScrollingMovementMethod;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 
@@ -14,14 +17,17 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
     private Logger logger;
     private Context context;
-    //private Accelerometer beschleunigungssensor;
+    private Accelerometer beschleunigungssensor;
-    private ThreadDemo threadDemo;
+    //private ThreadDemo threadDemo;
     private TextView textViewLog;
+    private Button button1;
     private TextView textViewWorkerThread;
+    SensorEvent event;
 
-    //private WorkerUsingThread workerUsingThread;
     ToggleButton toggleButton1;
 
+    boolean currentAlarm;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -35,8 +41,16 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         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
-        // beschleunigungssensor = new Accelerometer(this);
+        textViewWorkerThread.setMovementMethod(new ScrollingMovementMethod());
-        threadDemo = new ThreadDemo(this, textViewWorkerThread);
+
+        //Button to clear Log while Debugging
+        button1 = (Button) findViewById(R.id.button1);
+        button1.setOnClickListener(this);
+
+        //Accelerometer Setup
+        beschleunigungssensor = new Accelerometer(this, logger, textViewWorkerThread);
+        beschleunigungssensor.getSensor();
+
         logger.log("onCreate");
     }
 
@@ -48,21 +62,30 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     protected void onPause() {
         super.onPause();
         //beschleunigungssensor.stop();
-        threadDemo.stop();
+        //threadDemo.stop();
 
     }
 
-
     @Override
     public void onClick(View v) {
         logger.log("toggleButton1 is clicked");
-        if (toggleButton1.isChecked()) {
+        if(v == toggleButton1) {
-            logger.log("ToggleButton is ON");
+            if (toggleButton1.isChecked()) {
-            //beschleunigungssensor.start();
+                logger.log("ToggleButton is ON");
-            threadDemo.start();
+                //beschleunigungssensor.start();
-        } else {
+                beschleunigungssensor.startDetection();
-            logger.log("ToggleButton is OFF");
+                logger.log("Detection started");
-            threadDemo.stop();
+                //logger.log(stringBuffer.toString());
+
+            } else {
+                logger.log("ToggleButton is OFF");
+                //threadDemo.stop();
+                //beschleunigungssensor.stop();
+                beschleunigungssensor.stopDetection();
+                logger.log("Detection stopped");
+            }
+        } else if (v == button1) {
+            logger.clearLog();
         }
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -4,17 +4,23 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivityBackup">
+    tools:context=".MainActivity">
 
     <TextView
         android:id="@+id/textViewLog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginTop="60dp"
+        android:layout_marginEnd="32dp"
+        android:maxLines="25"
+        android:scrollbars="vertical"
         android:text="TextViewLoggerMain"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/textViewWorkerThread"
+        app:layout_constraintVertical_bias="0.0" />
 
     <ToggleButton
         android:id="@+id/toggleButton1"
@@ -32,12 +38,26 @@
         android:id="@+id/textViewWorkerThread"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="174dp"
+        android:layout_marginStart="32dp"
-        android:layout_marginTop="85dp"
+        android:layout_marginTop="16dp"
-        android:layout_marginEnd="179dp"
+        android:layout_marginEnd="32dp"
         android:text="textViewWorkerThreadTextView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/toggleButton1" />
 
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="35dp"
+        android:layout_marginTop="31dp"
+        android:layout_marginEnd="282dp"
+        android:layout_marginBottom="100dp"
+        android:text="Clear Log"
+        app:layout_constraintBottom_toTopOf="@+id/textViewWorkerThread"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>