Fixed errors after merge with origin:lm

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;
@@ -9,116 +9,122 @@ import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 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;
+    boolean alarm = false;
-    private String threadName = "Accelerometer Thread";
+    //Preallocate memory for the data of each axis of the acceleration sensor
-    double[] gravity = new double[3];
+    float x;
-    double[] linear_acceleration = new double[3];
+    float y;
-    private TextView textViewWorkerThread;
+    float z;
+    float betrag; //Betrag aller drei Achsen sqrt(x*x + y*y + z*z)
+    private DetectionReport detectionReport;
+    TextView textViewLog;
 
-    // In constructor pass Context from MainActivity in Accelerometer class
+
-    public Accelerometer(Context context, TextView textViewWorkerThread){
+    // In constructor pass Activity, Context and TextView from MainActivity in Accelerometer class
+    public Accelerometer(Context context, Logger mainLogger, TextView textViewLog){
+        super(context); //von Detektor
+        logger = mainLogger;
         this.context = context;
-        this.textViewWorkerThread = textViewWorkerThread;
+        this.textViewLog = textViewLog;
-    }
+        //Logger logger = new Logger(this.getClass().getSimpleName(), textViewLog, "");
-    // 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() {
-            @Override
-            public void run() {
-                textViewWorkerThread.setText(s);
-            }
-        });
-    }
-
-    @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 {
+        }
+        else {
             accelerometer = sensorManager.getSensorList(sensorType).get(0);
+            logger.log("Sensor gefunden");
         }
     }
-    }
-    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_NORMAL);
-        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];
-        linear_acceleration[1] = event.values[1] - gravity[1];
+        betrag = (float) sqrt(x*x + y*y + z*z);
-        linear_acceleration[2] = event.values[2] - gravity[2];
+        double schwelle = 1.5;
-
-        String sb = "t=" + event.timestamp +
-                "\nx=" + event.values[0] + // Wert liegend: x = 0.04
-                "\ny=" + event.values[1] + // Wert liegend: y = 0.44
-                "\nz=" + event.values[2] + // Wert liegend: z = 9.90 = Erdbeschleunigung --> Wenn Ausrichtung unbekannt ist, müsste kalibrierung bei Start der Bewegungsüberwachung vorgenommen werden
-                "\nlin_x=" + linear_acceleration[0] +
-                "\nlin_x=" + linear_acceleration[1] +
-                "\nlin_x=" + linear_acceleration[2];
 
+        if (!alarm) {
+            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)
+                        .append("\nAlarm an" + betrag + event.timestamp);
+                //logger.log("Alarm an");
+                //logger.log("Betrag: " + betrag + event.timestamp);
                 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");
     }
 }