Kopie Master Version 1.3 UDP Socket merged with sensor, mit Fehler

# Conflicts:
#	app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java
#	app/src/main/java/com/example/ueberwachungssystem/MainActivity.java

Notiz.txt

@@ -0,0 +1,3 @@
+Sensor als Service einrichten, der aus Activity heraus gestartet werden kann.
+Stichwort: Intent
+Siehe Skript Teil 1

app/build.gradle

@@ -26,6 +26,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
@@ -33,8 +36,25 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.gms:play-services-nearby:18.0.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    implementation 'com.jjoe64:graphview:4.2.2'
+
+
+    // OpenCV (from: https://github.com/QuickBirdEng/opencv-android)
+    def opencv_version = "4.5.3.0"
+    implementation "com.quickbirdstudios:opencv:${opencv_version}"
+
+    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
+
+
+    // Required for CameraX
+    def camerax_version = "1.2.2"
+    implementation "androidx.camera:camera-core:${camerax_version}"
+    implementation "androidx.camera:camera-camera2:${camerax_version}"
+    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
+    implementation "androidx.camera:camera-video:${camerax_version}"
+    implementation "androidx.camera:camera-view:${camerax_version}"
+    implementation "androidx.camera:camera-extensions:${camerax_version}"
 }

app/src/main/AndroidManifest.xml

@@ -2,11 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-feature android:name="android.hardware.camera"/>
     <uses-permission android:name="android.permission.CAMERA"/>
-    <!--<uses-permission android:name="android.permission.BLUETOOTH"/>-->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <!--<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>-->
+
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
@@ -27,6 +28,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+    <service android:name=".Detection.DetectorService"/>
     </application>
 
 </manifest>

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

@@ -0,0 +1,108 @@
+package com.example.ueberwachungssystem.Detection;
+
+import static java.lang.Math.sqrt;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+
+
+/**
+ * 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 {
+
+    public SensorManager sensorManager;
+    private static final int sensorType = Sensor.TYPE_LINEAR_ACCELERATION;
+    private Sensor accelerometer;
+    private Context context;
+    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 DetectionReport detectionReport;
+
+    // In constructor pass Activity, Context and TextView from MainActivity in Accelerometer class
+    public Accelerometer(Context context){
+        super(); //von Detektor
+        this.context = context;
+    }
+
+    public void getSensor(){
+        sensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+        if(sensorManager.getSensorList(sensorType).size()==0) {
+            accelerometer = null;
+        }
+        else {
+            accelerometer = sensorManager.getSensorList(sensorType).get(0);
+        }
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        try {
+            checkAlarm(event);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    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;
+
+        if (!alarm) {
+            if (betrag > threshold) {
+                alarm = true;
+                reportViolation("Bewegung", betrag);
+            }
+        } else {
+            if (betrag < threshold) {
+                alarm = false;
+            } else {
+            }
+        }
+    }
+
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {
+    }
+
+    @Override
+    public void startDetection() {
+        // entspricht void start()
+        //getSensor();
+        if (accelerometer != null) {
+            sensorManager.registerListener(this, accelerometer, SensorManager.SENSOR_DELAY_GAME);
+        }
+    }
+
+    @Override
+    public void stopDetection() {
+        // entspricht void stop()
+        sensorManager.unregisterListener(this, accelerometer);
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Detection/AudioRecorder.java

@@ -0,0 +1,74 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.content.Context;
+import android.media.MediaPlayer;
+import android.media.MediaRecorder;
+import android.widget.Toast;
+
+import java.io.File;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class AudioRecorder {
+    private final Context context;
+    private MediaRecorder mediaRecorder = null;
+    private boolean isRecording = false;
+    private File outputDir;      // Default: in app files directory
+
+
+    public AudioRecorder (Context context) {
+        this.context = context;
+        this.outputDir = context.getFilesDir();
+    }
+
+    public void startRecording() {
+        // Handle logic
+        if (outputDir == null)
+            return;
+        if (isRecording)
+            return;
+        isRecording = true;
+
+        // Setup Audio Recorder for output Format: 3GP
+        mediaRecorder = new MediaRecorder();
+        mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+        mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP);
+        mediaRecorder.setOutputFile(outputDir + "/" + generateFileName() + ".3gp");
+        mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
+        try {
+            mediaRecorder.prepare();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        mediaRecorder.start();
+    }
+
+    public void stopRecording() {
+        if (mediaRecorder != null) {
+            mediaRecorder.stop();
+            mediaRecorder.reset();
+            mediaRecorder.release();
+            mediaRecorder = null;
+            isRecording = false;
+            Toast.makeText(context, "audio recording saved", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public boolean isRecording(){
+        return isRecording;
+    }
+
+    public void setOutputDir(File outputDir) {
+        this.outputDir = outputDir;
+    }
+
+    private String generateFileName(){
+        // Get the current timestamp
+        LocalDateTime currentTime = LocalDateTime.now();
+        // Define the format for the timestamp
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss");
+        // Return the timestamp as a string
+        return currentTime.format(formatter);
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.annotation.SuppressLint;
+import android.util.Log;
+
+import com.example.ueberwachungssystem.WifiCommunication;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/** Detection Report Class */
+public class DetectionReport {
+    public String timeStamp;
+    public String detectionType;
+    public float detectedValue;
+    public boolean detectionState;
+
+    public DetectionReport(boolean detectionState, String detectionType, float detectedAmplitude) {
+        // New Date Format
+        @SuppressLint("SimpleDateFormat") SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
+        Date curDate = new Date(System.currentTimeMillis());
+        this.timeStamp = formatter.format(curDate);
+        //Old Date Format: this.timeStamp = String.valueOf(Calendar.getInstance().getTime());
+        this.detectionType = detectionType;
+        this.detectedValue = detectedAmplitude;
+        this.detectionState = detectionState;
+
+        //this.detectorID = detectorID;
+    }
+
+
+    /** Get Detection Report in String format */
+    public String toString() {
+        String state = "State: " + "[" + this.detectionState + "]";
+        String time = "Time: " + "[" + this.timeStamp + "]";
+        String type = "Type: " + "[" + this.detectionType + "]";
+        String value = "Value: " + "[" + this.detectedValue + "]";
+
+        return String.join("\t", state, time, type, value);
+    }
+
+    public String toMessage() {
+        String state;
+        if(detectionState)
+            state = "An";
+        else
+            state = "Aus";
+
+        return String.join(",", "1", timeStamp, "Gruppe2", WifiCommunication.getLocalIpAddress(), state, detectionType, String.valueOf(detectedValue));
+    }
+
+    /** Debug Report */
+    public void log(String tag) {
+        Log.d(tag, this.toString());
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Detection/Detector.java

@@ -0,0 +1,76 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.os.CountDownTimer;
+
+import androidx.annotation.NonNull;
+import androidx.camera.core.ExperimentalGetImage;
+
+
+abstract public class Detector {
+    private OnDetectionListener listener;
+    private boolean isDetecting = false;
+    private boolean extendViolation = false;
+
+    // Countdown parameters
+    private final int COUNTDOWN_TIME = 10000;          // milliseconds
+    private final int COUNTDOWN_POLLING_TIME = 100;   // milliseconds
+
+    /** Constructor - takes context of current activity */
+    public Detector() {}
+
+
+    /** On Detection Listener - runs when violation is reported */
+    public interface OnDetectionListener {
+        void onDetection(@NonNull DetectionReport detectionReport);
+    }
+    public void setOnDetectionListener(@NonNull OnDetectionListener listener) {
+        this.listener = listener;
+    }
+
+    /** Triggers onDetectionListener - call this to trigger violation/alarm */
+    public void reportViolation(String detectionType, float amplitude) {
+        if (listener != null) {
+            if (!isDetecting) {
+                isDetecting = true;
+                DetectionReport detectionReport = new DetectionReport(true, detectionType, amplitude);
+                listener.onDetection(detectionReport);
+                startDetectionTimer(detectionType, amplitude);
+            } else {
+                extendViolation = true;
+            }
+        } else {
+            isDetecting = false;
+            extendViolation = false;
+        }
+    }
+
+    private void startDetectionTimer(String detectionType, float amplitude) {
+        isDetecting = true;
+        new CountDownTimer((long) COUNTDOWN_TIME, COUNTDOWN_POLLING_TIME) {
+            @Override
+            public void onTick(long millisUntilFinished) {
+                if (extendViolation) {
+                    extendViolation = false;
+                    startDetectionTimer(detectionType, amplitude);
+                    this.cancel();
+                }
+            }
+            @Override
+            public void onFinish() {
+                isDetecting = false;
+                DetectionReport detectionReport = new DetectionReport(false, detectionType, amplitude);
+                listener.onDetection(detectionReport);
+            }
+        }.start();
+    }
+
+    public void extendViolation(){
+        this.extendViolation = true;
+    }
+
+    /** Starts Detection (abstract method: needs to be overridden in child class) */
+    public abstract void startDetection();
+
+    /** Stops Detection (abstract method: needs to be overridden in child class) */
+    public abstract void stopDetection();
+}

app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java

@@ -0,0 +1,140 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+import android.util.Log;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.core.ExperimentalGetImage;
+import androidx.lifecycle.LifecycleService;
+
+import com.example.ueberwachungssystem.WifiCommunication;
+
+import java.io.File;
+
+@ExperimentalGetImage
+public class DetectorService extends LifecycleService {
+    public ServiceBinder serviceBinder = new ServiceBinder();
+    private DetectorService.OnDetectionListener listener;
+    private boolean isServiceRunning = false;
+
+    // Used Objects:
+    public VideoDetector videoDetector = null;
+    public AudioRecorder audioRecorder = null;
+    public Accelerometer motionDetector = null;
+    public MicrophoneDetector audioDetector = null;
+
+    WifiCommunication wifiCommunication;
+
+    String dataFromWifi;
+    StringBuffer stringBufferFromWifi;
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (isServiceRunning)
+            return START_NOT_STICKY;
+
+
+        /** Wifi Instanz Starten und Listener **/
+        wifiCommunication = new WifiCommunication (1234);
+        wifiCommunication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
+            @Override
+            public void onConnection(String data) {
+                dataFromWifi = data;
+                stringToStringbuffer(data);
+            }
+
+        });
+
+
+
+        /** Video Detection/Recorder **/
+        videoDetector = new VideoDetector(this);
+        videoDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
+            @Override
+            public void onDetection(@NonNull DetectionReport detectionReport) {
+                //passToServiceListener(detectionReport);
+                Log.d("Video", detectionReport.toMessage());
+                wifiCommunication.sendTrue(detectionReport.toMessage());
+
+            }
+        });
+        /** Motion Detection**/
+        motionDetector = new Accelerometer(this);
+        motionDetector.getSensor();
+        motionDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
+            @Override
+            public void onDetection(@NonNull DetectionReport detectionReport) {
+                //passToServiceListener(detectionReport);
+                Log.d("Motion", detectionReport.toMessage());
+                wifiCommunication.sendTrue(detectionReport.toMessage());
+            }
+        });
+        /** Audio Detection **/
+        audioDetector = new MicrophoneDetector(this);
+        audioDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
+            @Override
+            public void onDetection(@NonNull DetectionReport detectionReport) {
+                //passToServiceListener(detectionReport);
+                Log.d("Audio", detectionReport.toMessage());
+                wifiCommunication.sendTrue(detectionReport.toMessage());
+            }
+        });
+        /** Audio Recorder**/
+        audioRecorder = new AudioRecorder(this);
+
+
+
+
+        isServiceRunning = true;
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        isServiceRunning = false;
+    }
+
+    /** Service methods */
+    public class ServiceBinder extends Binder {
+        public DetectorService getBoundService() {
+            // Return an instance of the TestService
+            return DetectorService.this;
+        }
+    }
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        super.onBind(intent);
+        return serviceBinder;
+    }
+
+
+    /** Pass Detection Report to Service Detection Listener and trigger it */
+    public void passToServiceListener(StringBuffer stringBuffer) {
+        if (listener != null) {
+            listener.onDetection(stringBuffer);
+        }
+    }
+
+
+    /** On Detection Listener - runs when violation is reported */
+    public interface OnDetectionListener {
+        void onDetection(@NonNull StringBuffer stringBuffer);
+    }
+    public void setOnDetectionListener(@NonNull DetectorService.OnDetectionListener listener) {
+        this.listener = listener;
+    }
+
+    /** string to stringbuffer **/
+    public void stringToStringbuffer(String dataString){
+        stringBufferFromWifi.append(dataString).append("\n");
+        passToServiceListener(stringBufferFromWifi);
+
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Detection/MicrophoneDetector.java

@@ -1,26 +1,17 @@
-package com.example.ueberwachungssystem.Detector;
+package com.example.ueberwachungssystem.Detection;
 
 import static java.lang.Math.*;
 
-import android.Manifest;
+import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaRecorder;
 import android.os.AsyncTask;
 import android.util.Log;
 
-import androidx.core.app.ActivityCompat;
+import com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex;
-import androidx.core.content.ContextCompat;
+import com.example.ueberwachungssystem.Detection.Signalverarbeitung.FFT;
-
-import com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex;
-import com.example.ueberwachungssystem.Detector.Signalverarbeitung.FFT;
-import com.example.ueberwachungssystem.Detector.logger.Logger;
-import com.jjoe64.graphview.GraphView;
-import com.jjoe64.graphview.series.DataPoint;
-import com.jjoe64.graphview.series.LineGraphSeries;
 
 public class MicrophoneDetector extends Detector {
     /**
@@ -29,32 +20,20 @@ public class MicrophoneDetector extends Detector {
      * @param context
      */
 
-    private static final int RECHTEANFORDERUNG_MIKROFON = 1;
-
     private AufnahmeTask aufnahmeTask;
     public boolean armed = false;
-    public int Schwellwert_Alarm = 100;
+    public int schwellwertAlarm = 100;
-    private Activity MainActivityForClass;
+    private Context context;
 
     public MicrophoneDetector(Context context) {
-        super(context);
+        super();
-        MainActivityForClass = (Activity) context;
+        this.context = context;
-
-        if (!istZugriffAufMikrofonErlaubt()) {
-            zugriffAufMikrofonAnfordern();
-        }
     }
 
     @Override
     public void startDetection() {
-
+        aufnahmeTask = new AufnahmeTask();
-        if (!istZugriffAufMikrofonErlaubt()) {
+        aufnahmeTask.execute();
-            zugriffAufMikrofonAnfordern();
-        }
-        if (istZugriffAufMikrofonErlaubt()) {
-            aufnahmeTask = new AufnahmeTask();
-            aufnahmeTask.execute();
-        }
     }
 
     @Override
@@ -64,47 +43,31 @@ public class MicrophoneDetector extends Detector {
         }
     }
 
-    private boolean istZugriffAufMikrofonErlaubt() {
-        if (ContextCompat.checkSelfPermission(MainActivityForClass, android.Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
-            Log.d("0","Zugriff auf Mikrofon ist verboten.");
-            return false;
-        } else {
-            Log.d("0","Zugriff auf Mikrofon ist erlaubt.");
-            return true;
-        }
-    }
-
-    private void zugriffAufMikrofonAnfordern() {
-        ActivityCompat.requestPermissions(MainActivityForClass, new String[]{Manifest.permission.RECORD_AUDIO}, RECHTEANFORDERUNG_MIKROFON);
-    }
-
     class AufnahmeTask extends AsyncTask<Long, Verarbeitungsergebnis, Void> {
         private AudioRecord recorder;
         private final int sampleRateInHz = 44100;
         private final int channelConfig = AudioFormat.CHANNEL_IN_MONO;
         private final int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
+
+        private final int startDelay = 20000;
+        private final int threadSleeptime = 10;
         private int minPufferGroesseInBytes;
         private int pufferGroesseInBytes;
         private RingPuffer ringPuffer = new RingPuffer(10);
         private float kalibierWert;
-        private DetectionReport detectionReport;
+        private com.example.ueberwachungssystem.Detection.DetectionReport detectionReport;
 
+
+
+        @SuppressLint("MissingPermission")
         AufnahmeTask() {
             minPufferGroesseInBytes = AudioRecord.getMinBufferSize(sampleRateInHz, channelConfig, audioFormat);
             pufferGroesseInBytes = minPufferGroesseInBytes * 2;
-            if (ActivityCompat.checkSelfPermission(MainActivityForClass, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+            try {
-                // TODO: Consider calling
+                recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRateInHz, channelConfig, audioFormat, pufferGroesseInBytes);
-                //    ActivityCompat#requestPermissions
+            } catch (Exception e) {
-                // here to request the missing permissions, and then overriding
+                e.printStackTrace();
-                //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
-                //                                          int[] grantResults)
-                // to handle the case where the user grants the permission. See the documentation
-                // for ActivityCompat#requestPermissions for more details.
-                ActivityCompat.requestPermissions(MainActivityForClass, new String[]{Manifest.permission.RECORD_AUDIO}, RECHTEANFORDERUNG_MIKROFON);
             }
-
-            recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRateInHz, channelConfig, audioFormat, pufferGroesseInBytes);
-
             Log.d("0","Puffergroeße: "+ minPufferGroesseInBytes + " " + pufferGroesseInBytes);
             Log.d("0","Recorder (SR, CH): "+ recorder.getSampleRate() + " " + recorder.getChannelCount());
 
@@ -144,9 +107,6 @@ public class MicrophoneDetector extends Detector {
 
             Log.d("0","Konfiguration: "+ s);
 
-            int pufferGroesseInAnzahlAbtastwerten = pufferGroesseInBytes / anzahlBytesProAbtastwert;
-            int pufferGroesseInMillisekunden = 1000 * pufferGroesseInAnzahlAbtastwerten / recorder.getSampleRate();
-
         }
 
         @Override
@@ -162,7 +122,7 @@ public class MicrophoneDetector extends Detector {
 
             //Kalibrierung
             try {
-                Thread.sleep(3000); // Time to lay down the phone
+                Thread.sleep(startDelay); // Time to lay down the phone
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
@@ -172,7 +132,7 @@ public class MicrophoneDetector extends Detector {
                 Verarbeitungsergebnis kalibrierErgebnis = verarbeiten(puffer, n);
                 kalibierWert += kalibrierErgebnis.maxAmp;
                 try {
-                    Thread.sleep(50);
+                    Thread.sleep(threadSleeptime);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
@@ -201,6 +161,7 @@ public class MicrophoneDetector extends Detector {
                     int n = recorder.read(puffer, 0, puffer.length);
                     Verarbeitungsergebnis ergebnis = verarbeiten(puffer, n);
                     anzahlVerarbeitet += n;
+
 //                    __Part of FFT__
 //                    spektrum = calculateFFT(puffer);
 //                    LineGraphSeries<DataPoint> newseries = new LineGraphSeries<DataPoint>(new DataPoint[]{});
@@ -225,7 +186,7 @@ public class MicrophoneDetector extends Detector {
                     publishProgress(ergebnis);
 
                     try {
-                        Thread.sleep(10);
+                        Thread.sleep(threadSleeptime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
@@ -253,7 +214,7 @@ public class MicrophoneDetector extends Detector {
 
                 ringPuffer.hinzufuegen(max);
                 maxAmp = ringPuffer.maximum();
-                if (maxAmp <= Schwellwert_Alarm+kalibierWert) {
+                if (maxAmp <= schwellwertAlarm + kalibierWert) {
                     armed = true;
                 }
             }
@@ -266,13 +227,13 @@ public class MicrophoneDetector extends Detector {
             super.onProgressUpdate(progress);
             float maxAmpPrint = round(20*log10(abs(progress[0].maxAmp/1.0)));
             float kalibierWertPrint = round(20*log10(abs(kalibierWert)));
-            Log.d("0","VR, Max, Kal:" + progress[0].verarbeitungsrate + ", " + maxAmpPrint
+            Log.d("alarmAudio","VR: " + progress[0].verarbeitungsrate + ", Amp: " + maxAmpPrint
-            + " dB, " + kalibierWertPrint + " dB");
+            + " dB, Kal: " + kalibierWertPrint + " dB");
 
-            if (progress[0].maxAmp >= Schwellwert_Alarm+kalibierWert && armed == true) {
+            if (progress[0].maxAmp >= schwellwertAlarm + kalibierWert && armed == true) {
                 armed = false;
-                detectionReport = new DetectionReport("Mic1", "Audio", maxAmpPrint);
+                detectionReport = new DetectionReport(true, "Audio", maxAmpPrint);
-                reportViolation("Mic1", "Audio", maxAmpPrint);
+                reportViolation("Audio", maxAmpPrint);
                 Log.d("1",detectionReport.toString());
             }
         }
@@ -288,7 +249,6 @@ public class MicrophoneDetector extends Detector {
         }
 
         final int mNumberOfFFTPoints =1024;
-        double mMaxFFTSample;
 
         double temp;
         Complex[] y;
@@ -302,15 +262,9 @@ public class MicrophoneDetector extends Detector {
 
         y = FFT.fft(complexSignal);
 
-        mMaxFFTSample = 0.0;
         for(int i = 0; i < (mNumberOfFFTPoints/2); i++)
         {
             absSignal[i] = y[i].abs();
-//            absSignal[i] = Math.sqrt(Math.pow(y[i].re(), 2) + Math.pow(y[i].im(), 2));
-//            if(absSignal[i] > mMaxFFTSample)
-//            {
-//                mMaxFFTSample = absSignal[i];
-//            }
         }
 
         return absSignal;
@@ -398,16 +352,6 @@ public class MicrophoneDetector extends Detector {
             this.wichtungAlterWert = 1 - this.wichtungNeuerWert;
         }
 
-        float MittelwertPuffer(short[] puffer) {
-
-            for (int i = 0; i < puffer.length; i++) {
-                mittelwert = Math.abs(puffer[i]);
-            }
-            mittelwert = mittelwert/puffer.length;
-
-            return mittelwert;
-        }
-
         float mittel(float wert) {
             if (istMittelwertGesetzt) {
                 mittelwert = wert * wichtungNeuerWert + mittelwert * wichtungAlterWert;

app/src/main/java/com/example/ueberwachungssystem/Detection/OpenCVHelper.java

@@ -0,0 +1,109 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.graphics.Bitmap;
+import android.media.Image;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.camera.core.ExperimentalGetImage;
+import androidx.camera.core.ImageProxy;
+
+import org.opencv.android.Utils;
+import org.opencv.core.Core;
+import org.opencv.core.CvType;
+import org.opencv.core.Mat;
+import org.opencv.core.MatOfPoint;
+import org.opencv.core.Scalar;
+import org.opencv.core.Size;
+import org.opencv.imgproc.Imgproc;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+@ExperimentalGetImage
+public class OpenCVHelper {
+
+    /** OpenCV helper methods **/
+    public static Mat addGaussianBlur(Mat inputMat, Size kernelSize){
+        Mat outputMat = new Mat();
+        Imgproc.GaussianBlur(inputMat, outputMat, kernelSize, 0);
+        return outputMat;
+    }
+
+    public static Mat addBlur(Mat inputMat, Size kernelSize){
+        Mat outputMat = new Mat();
+        Imgproc.blur(inputMat, outputMat, kernelSize);
+        return outputMat;
+    }
+
+    public static Mat extractYChannel(@NonNull ImageProxy imgProxy) {
+        Image img = imgProxy.getImage();
+
+        assert img != null;
+        ByteBuffer yBuffer = img.getPlanes()[0].getBuffer();
+        byte[] yData = new byte[yBuffer.remaining()];
+        yBuffer.get(yData);
+
+        Mat yMat = new Mat(img.getHeight(), img.getWidth(), CvType.CV_8UC1);
+        yMat.put(0, 0, yData);
+
+        return yMat;
+    }
+
+    public static Mat thresholdPixels(Mat inputMat, Mat previousImage, int threshold){
+        Mat diffImage = new Mat();
+        Core.absdiff(inputMat, previousImage, diffImage);
+        Mat binaryMat = new Mat();
+        Imgproc.threshold(diffImage, binaryMat, threshold, 255, Imgproc.THRESH_BINARY);
+        return binaryMat;
+    }
+
+
+    public static Mat thresholdContourArea(Mat inputMat, float areaThreshold){
+        List<MatOfPoint> contours = new ArrayList<>();
+        Mat hierarchy = new Mat();
+        Imgproc.findContours(inputMat, contours, hierarchy, Imgproc.RETR_EXTERNAL, Imgproc.CHAIN_APPROX_SIMPLE);
+
+        Mat outputMat = new Mat(inputMat.size(), inputMat.type(), new Scalar(0));
+        // Iterate over the contours and draw only the larger contours on the outputMat
+        for (MatOfPoint contour : contours) {
+            double contourArea = Imgproc.contourArea(contour);
+            if (contourArea > areaThreshold) {
+                Imgproc.drawContours(outputMat, Collections.singletonList(contour), 0, new Scalar(255), -1);
+            }
+        }
+        // Apply the outputMat as a mask to the dilatedImage
+        Mat maskedImage = new Mat();
+        inputMat.copyTo(maskedImage, outputMat);
+        return outputMat;
+    }
+
+    public static Mat dilateBinaryMat(Mat inputMat, Size kernelSize){
+        Mat dilatedMat = new Mat();
+        Mat kernel = Imgproc.getStructuringElement(Imgproc.MORPH_ELLIPSE, kernelSize);
+        Imgproc.dilate(inputMat, dilatedMat, kernel);
+        return dilatedMat;
+    }
+
+    public static int countNonZeroPixels(Mat inputImage) {
+        if (inputImage != null)
+            return Core.countNonZero(inputImage);
+        else
+            return 0;
+    }
+
+
+    public static void debugMat(Mat mat, ImageView imageView) {
+        if (imageView == null || mat == null)
+            return;
+
+        Bitmap bitmap = Bitmap.createBitmap(mat.cols(), mat.rows(), Bitmap.Config.ARGB_8888);
+        Utils.matToBitmap(mat, bitmap);
+
+        // Display the bitmap in an ImageView
+        imageView.setImageBitmap(bitmap);
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Detection/Signalverarbeitung/Complex.java

@@ -1,4 +1,4 @@
-package com.example.ueberwachungssystem.Detector.Signalverarbeitung;
+package com.example.ueberwachungssystem.Detection.Signalverarbeitung;
 
 import java.util.Objects;
 
@@ -12,7 +12,7 @@ public class Complex {
         im = imag;
     }
 
-    // return a string representation of the invoking com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object
+    // return a string representation of the invoking com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object
     public String toString() {
         if (im == 0) return re + "";
         if (re == 0) return im + "i";
@@ -30,7 +30,7 @@ public class Complex {
         return Math.atan2(im, re);
     }
 
-    // return a new com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object whose value is (this + b)
+    // return a new com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object whose value is (this + b)
     public Complex plus(Complex b) {
         Complex a = this;             // invoking object
         double real = a.re + b.re;
@@ -38,7 +38,7 @@ public class Complex {
         return new Complex(real, imag);
     }
 
-    // return a new com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object whose value is (this - b)
+    // return a new com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object whose value is (this - b)
     public Complex minus(Complex b) {
         Complex a = this;
         double real = a.re - b.re;
@@ -46,7 +46,7 @@ public class Complex {
         return new Complex(real, imag);
     }
 
-    // return a new com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object whose value is (this * b)
+    // return a new com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object whose value is (this * b)
     public Complex times(Complex b) {
         Complex a = this;
         double real = a.re * b.re - a.im * b.im;
@@ -59,12 +59,12 @@ public class Complex {
         return new Complex(alpha * re, alpha * im);
     }
 
-    // return a new com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object whose value is the conjugate of this
+    // return a new com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object whose value is the conjugate of this
     public Complex conjugate() {
         return new Complex(re, -im);
     }
 
-    // return a new com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object whose value is the reciprocal of this
+    // return a new com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object whose value is the reciprocal of this
     public Complex reciprocal() {
         double scale = re * re + im * im;
         return new Complex(re / scale, -im / scale);
@@ -85,22 +85,22 @@ public class Complex {
         return a.times(b.reciprocal());
     }
 
-    // return a new com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object whose value is the complex exponential of this
+    // return a new com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object whose value is the complex exponential of this
     public Complex exp() {
         return new Complex(Math.exp(re) * Math.cos(im), Math.exp(re) * Math.sin(im));
     }
 
-    // return a new com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object whose value is the complex sine of this
+    // return a new com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object whose value is the complex sine of this
     public Complex sin() {
         return new Complex(Math.sin(re) * Math.cosh(im), Math.cos(re) * Math.sinh(im));
     }
 
-    // return a new com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object whose value is the complex cosine of this
+    // return a new com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object whose value is the complex cosine of this
     public Complex cos() {
         return new Complex(Math.cos(re) * Math.cosh(im), -Math.sin(re) * Math.sinh(im));
     }
 
-    // return a new com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex object whose value is the complex tangent of this
+    // return a new com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex object whose value is the complex tangent of this
     public Complex tan() {
         return sin().divides(cos());
     }

app/src/main/java/com/example/ueberwachungssystem/Detection/Signalverarbeitung/FFT.java

@@ -1,10 +1,10 @@
-package com.example.ueberwachungssystem.Detector.Signalverarbeitung;
+package com.example.ueberwachungssystem.Detection.Signalverarbeitung;
 // Source: https://introcs.cs.princeton.edu/java/97data/FFT.java.html
 
 /******************************************************************************
  *  Compilation:  javac FFT.java
  *  Execution:    java FFT n
- *  Dependencies: com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex.java
+ *  Dependencies: com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex.java
  *
  *  Compute the FFT and inverse FFT of a length n complex sequence
  *  using the radix 2 Cooley-Tukey algorithm.
@@ -156,7 +156,7 @@ public class FFT {
         return y;
     }
 
-    // display an array of com.example.ueberwachungssystem.Detector.Signalverarbeitung.Complex numbers to standard output
+    // display an array of com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex numbers to standard output
     public static void show(Complex[] x, String title) {
         System.out.println(title);
         System.out.println("-------------------");

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

@@ -0,0 +1,332 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.ImageFormat;
+import android.media.Image;
+import android.os.CountDownTimer;
+import android.util.Log;
+import android.view.Display;
+import android.view.Surface;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ExperimentalGetImage;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.ImageProxy;
+import androidx.camera.core.Preview;
+import androidx.camera.core.VideoCapture;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import org.opencv.android.OpenCVLoader;
+import org.opencv.core.Mat;
+import org.opencv.core.Size;
+
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.concurrent.ExecutionException;
+
+
+/**
+ * Video Detector inherits some methods from abstract Detector class (more info there)
+ * */
+
+
+@ExperimentalGetImage
+public class VideoDetector extends Detector {
+    // Calling Activity
+    private final Context context;
+
+    // Camera Provider
+    private ProcessCameraProvider cameraProvider;
+    private ImageAnalysis imageAnalysis;
+    private VideoCapture videoCapture;
+    //private Preview preview;
+
+    // Logic
+    private boolean isDetecting = false;
+    private boolean isRecording = false;
+    private boolean allowReportViolation = false;
+
+    // Image Processing
+    private Mat previousImage = null;
+
+    // Debugging
+    private ImageView inputImageView = null;
+    private ImageView outputImageView = null;
+
+    // Recorder
+    private File outputDir;      // Default: in app files directory
+
+
+    // Parameters
+    private static final float ALARM_THRESHOLD = 0f;   // Percent of pixels changed
+    private static final float AREA_THRESHOLD = 10f;
+    private static final int DILATE_ITERATIONS = 2;
+    private static final float START_DELAY = 20000;   // milliseconds
+    private static final android.util.Size IMAGE_RES = new android.util.Size(640, 480);
+
+
+
+    /** Constructor */
+    public VideoDetector(Context context) {
+        super();
+        this.context = context;
+        this.imageAnalysis = setupImageAnalysis();
+        this.videoCapture = setupVideoCapture();
+        this.outputDir = context.getFilesDir();
+        //this.preview = new Preview.Builder().build();
+    }
+
+    /** Get States */
+    public boolean isDetecting() {
+        return isDetecting;
+    }
+    public boolean isRecording(){
+        return isRecording;
+    }
+
+
+    /** Starts the Video Detection */
+    @Override
+    public void startDetection() {
+        // Check States
+        if (isDetecting)
+            return;
+        // Configure Image Analysis
+        imageAnalysis = setupImageAnalysis();
+        // Open CV startup check
+        if (!OpenCVLoader.initDebug()) {
+            Log.e("OpenCV", "Unable to load OpenCV!");
+            return;
+        } else
+            Log.d("OpenCV", "OpenCV loaded Successfully!");
+        // Get Process Camera Provider and start
+        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
+        cameraProviderFuture.addListener(() -> {
+            try {
+                cameraProvider = cameraProviderFuture.get();
+                isDetecting = true;
+                bindCameraProvider();
+            } catch (ExecutionException | InterruptedException e) {}
+        }, ContextCompat.getMainExecutor(context));
+        // Disable Violation Calling for Setup Time
+        startViolationTimer(START_DELAY);
+    }
+
+    /** Starts the Recorder */
+    @SuppressLint("RestrictedApi")
+    public void startRecording() {
+        // Check States
+        if (isRecording){
+            return;
+        }
+
+        videoCapture = setupVideoCapture();
+
+        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
+        cameraProviderFuture.addListener(() -> {
+            try {
+                cameraProvider = cameraProviderFuture.get();
+                isRecording = true;
+                bindCameraProvider();
+
+                File vidFile = new File(context.getFilesDir() + "/" + generateFileName() + ".mp4");
+                if (ActivityCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+                    return;
+                }
+                videoCapture.startRecording(
+                        new VideoCapture.OutputFileOptions.Builder(vidFile).build(),
+                        context.getMainExecutor(),
+                        new VideoCapture.OnVideoSavedCallback() {
+                            @Override
+                            public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
+                                isRecording = false;
+                                Toast.makeText(context, "video recording saved", Toast.LENGTH_SHORT).show();
+                            }
+                            @Override
+                            public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
+                                isRecording = false;
+                                Toast.makeText(context, "video recording failed", Toast.LENGTH_SHORT).show();
+                            }
+                        }
+                );
+            } catch (ExecutionException | InterruptedException ignored) {}
+        }, ContextCompat.getMainExecutor(context));
+    }
+
+    /** Stops the Video Detection */
+    @Override
+    public void stopDetection() {
+        if (!isDetecting || imageAnalysis == null)
+            return;
+        if (!isRecording)
+            cameraProvider.unbindAll();
+        else
+            cameraProvider.unbind(imageAnalysis);
+        isDetecting = false;
+        allowReportViolation = false;
+    }
+
+    /** Stops the Recording */
+    @SuppressLint("RestrictedApi")
+    public void stopRecording(){
+        if(!isRecording)
+            return;
+
+        videoCapture.stopRecording();
+
+        if (!isDetecting())
+            cameraProvider.unbindAll();
+        else
+            cameraProvider.unbind(videoCapture);
+        isRecording = false;
+    }
+
+    /** Bind Camera Provider */
+    private void bindCameraProvider() {
+        // Specify which Camera to use
+        CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
+        cameraProvider.unbindAll();
+        cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, videoCapture);
+    }
+
+    /** Setup Use Cases */
+    private ImageAnalysis setupImageAnalysis() {
+        // Configure and create Image Analysis
+        ImageAnalysis.Builder builder = new ImageAnalysis.Builder();
+        builder.setTargetResolution(IMAGE_RES);
+        builder.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST);
+        builder.setOutputImageFormat(ImageAnalysis.OUTPUT_IMAGE_FORMAT_YUV_420_888);
+        builder.setTargetRotation(Surface.ROTATION_90);
+        ImageAnalysis imageAnalysis = builder.build();
+        // Set Analyzer
+        imageAnalysis.setAnalyzer(ContextCompat.getMainExecutor(context), imageProxy -> {
+            if (imageProxy.getFormat() == ImageFormat.YUV_420_888) {
+                Image image = imageProxy.getImage();
+                assert image != null;
+
+                // Violation Handling
+                Mat processed = processImage(imageProxy);
+
+                int n = OpenCVHelper.countNonZeroPixels(processed);
+                int pixelCount = image.getWidth() * image.getHeight();
+                float percentChanged = ((float) n / pixelCount) * 100;
+
+                // Violation Condition
+                if (percentChanged> ALARM_THRESHOLD) {
+                    if (allowReportViolation)
+                        reportViolation("Video", percentChanged);
+                }
+            }
+            imageProxy.close();
+        });
+        return imageAnalysis;
+    }
+
+    @SuppressLint("RestrictedApi")
+    private VideoCapture setupVideoCapture() {
+        int rotation = getDisplayRotation();
+        return new VideoCapture.Builder()
+                .setTargetRotation(rotation)
+                .build();
+    }
+
+    /** Process Image to be used for Motion Detection */
+    private Mat processImage(ImageProxy imageProxy){
+        if (imageProxy == null)
+            return null;
+        // Image Transformation
+        Mat imageMat = OpenCVHelper.extractYChannel(imageProxy);
+        // Show Input Image
+        if (inputImageView != null)
+            OpenCVHelper.debugMat(imageMat, inputImageView);
+        // Preprocess Image
+        Mat preprocessed = imageMat;
+        preprocessed = OpenCVHelper.addGaussianBlur(preprocessed, new Size(21, 21));
+        preprocessed = OpenCVHelper.addBlur(preprocessed, new Size(3, 3));
+        // Set Previous Image
+        if (previousImage == null) {
+            previousImage = preprocessed;
+            return null;
+        }
+        // Process Image
+        Mat processed = preprocessed.clone();
+        processed = OpenCVHelper.thresholdPixels(processed, previousImage, 25);
+
+        for(int i = 0; i < DILATE_ITERATIONS; i++)
+            processed = OpenCVHelper.dilateBinaryMat(processed, new Size(3,3));
+
+        processed = OpenCVHelper.thresholdContourArea(processed, AREA_THRESHOLD);
+        // Output
+        previousImage = preprocessed.clone();
+        // Show Output Image
+        if (outputImageView != null)
+            OpenCVHelper.debugMat(processed, outputImageView);
+        return processed;
+    }
+
+
+    /** Debug input and result of processing */
+    public void debugProcessing(@NonNull ImageView inputImageView, @NonNull ImageView outputImageView){
+        this.inputImageView = inputImageView;
+        this.outputImageView = outputImageView;
+    }
+
+    /**
+    private void setPreviewView(@NonNull PreviewView previewView) {
+        // Create Preview
+        if (this.preview != null)
+            this.preview.setSurfaceProvider(previewView.getSurfaceProvider());
+    }
+     */
+
+
+    /** Generate File Name */
+    private String generateFileName(){
+        // Get the current timestamp
+        LocalDateTime currentTime = LocalDateTime.now();
+        // Define the format for the timestamp
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss");
+        // Return the timestamp as a string
+        return currentTime.format(formatter);
+    }
+
+
+    /** Get current Display Rotation */
+    private int getDisplayRotation() {
+        WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = windowManager.getDefaultDisplay();
+        return display.getRotation();
+    }
+
+    /** Start delay until Violation Report is allowed */
+    private void startViolationTimer(float setupTime) {
+        new CountDownTimer((long) (setupTime), 100) {
+            @Override
+            public void onTick(long millisUntilFinished) {
+            }
+            @Override
+            public void onFinish() {
+                allowReportViolation = true;
+            }
+        }.start();
+    }
+
+    public void setOutputDir(File outputDir) {
+        this.outputDir = outputDir;
+    }
+}

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

@@ -1,36 +0,0 @@
-package com.example.ueberwachungssystem.Detector;
-
-import android.util.Log;
-
-import java.util.Calendar;
-
-/** Detection Report Class */
-public class DetectionReport {
-    public String timeStamp;
-    public String detectionType;
-    public float detectedValue;
-    public String detectorID;
-
-    public DetectionReport(String detectorID, String detectionType, float detectedAmplitude) {
-        this.timeStamp = String.valueOf(Calendar.getInstance().getTime());
-        this.detectionType = detectionType;
-        this.detectedValue = detectedAmplitude;
-        this.detectorID = detectorID;
-    }
-
-
-    /** Get Detection Report in String format */
-    public String toString() {
-        String time = "Time: " + "[" + this.timeStamp + "]";
-        String type = "Type: " + "[" + this.detectionType + "]";
-        String value = "Value: " + "[" + this.detectedValue + "]";
-        String id = "ID: " + "[" + this.detectorID + "]";
-
-        return String.join("\t", time, type, value, id);
-    }
-
-    /** Debug Report */
-    public void log(String tag) {
-        Log.d(tag, this.toString());
-    }
-}

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

@@ -1,39 +0,0 @@
-package com.example.ueberwachungssystem.Detector;
-
-import android.content.Context;
-import androidx.annotation.NonNull;
-
-
-abstract public class Detector {
-    private OnDetectionListener listener;
-
-    /** Constructor - takes context of current activity */
-    public Detector(Context context) {};
-
-
-    /** On Detection Listener - runs when violation is reported */
-    public interface OnDetectionListener {
-        void onDetection(@NonNull DetectionReport detectionReport);
-    }
-    public void setOnDetectionListener(@NonNull OnDetectionListener listener) {
-        this.listener = listener;
-    }
-
-
-    /** Triggers onDetectionListener - call this to trigger violation/alarm */
-    public void reportViolation(String detectorID, String detectionType, float amplitude) {
-        if (listener != null) {
-            DetectionReport detectionReport = new DetectionReport(detectorID, detectionType, amplitude);
-            listener.onDetection(detectionReport);
-        } else {
-            throw new IllegalStateException("No listener set for violation reporting");
-        }
-    }
-
-
-    /** Starts Detection (abstract method: needs to be overridden in child class) */
-    public abstract void startDetection();
-
-    /** Stops Detection (abstract method: needs to be overridden in child class) */
-    public abstract void stopDetection();
-}

app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment1.java

@@ -0,0 +1,48 @@
+package com.example.ueberwachungssystem.Fragments;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+
+import com.example.ueberwachungssystem.R;
+
+public class Fragment1 extends Fragment {
+    private String text;
+    private final static String KEY_TEXT = "KEY_TEXT";
+
+    private void log(String nachricht) {
+        Log.d(this.getClass().getSimpleName(), nachricht);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
+        log("onCreateView");
+        View view = inflater.inflate(R.layout.fragment1, container, false);
+        TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
+        Sensor.setText(text);
+        return view;
+    }
+    public static Fragment1 erstellen(String text) {
+        Fragment1 fragment = new Fragment1();
+        Bundle b = new Bundle();
+        b.putString(KEY_TEXT, text);
+        fragment.setArguments(b);
+        return fragment;
+    }
+    @Override
+    public void onCreate(Bundle bundle) {
+        super .onCreate(bundle);
+        Bundle args = getArguments();
+        if (args != null ) {
+            text = args.getString(KEY_TEXT);
+            log("onCreate: text=" + text);
+        } else {
+            log("onCreate");
+        }
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment2.java

@@ -0,0 +1,46 @@
+package com.example.ueberwachungssystem.Fragments;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+
+import com.example.ueberwachungssystem.R;
+
+public class Fragment2 extends Fragment {
+    private String text;
+    private final static String KEY_TEXT = "KEY_TEXT" ;
+    private void log(String nachricht) {
+        Log.d(this.getClass().getSimpleName(), nachricht);
+    }
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
+        log( "onCreateView" );
+        View view = inflater.inflate(R.layout.fragment2, container, false );
+        TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
+        Sensor.setText(text);
+        return view;
+    }
+    public static Fragment2 erstellen(String text) {
+        Fragment2 fragment = new Fragment2();
+        Bundle b = new Bundle();
+        b.putString(KEY_TEXT, text);
+        fragment.setArguments(b);
+        return fragment;
+    }
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        Bundle args = getArguments();
+        if (args != null) {
+            text = args.getString(KEY_TEXT);
+            log("onCreate: text=" + text);
+        } else {
+            log("onCreate");
+        }
+    }
+}

app/src/main/java/com/example/ueberwachungssystem/Fragments/Fragment3.java

@@ -0,0 +1,46 @@
+package com.example.ueberwachungssystem.Fragments;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+
+import com.example.ueberwachungssystem.R;
+
+public class Fragment3 extends Fragment {
+    private String text;
+    private final static String KEY_TEXT = "KEY_TEXT" ;
+    private void log(String nachricht) {
+        Log.d(this.getClass().getSimpleName(), nachricht);
+    }
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
+        log( "onCreateView" );
+        View view = inflater.inflate(R.layout.fragment2, container, false );
+        TextView Sensor = (TextView) view.findViewById(R.id.Sensor);
+        Sensor.setText(text);
+        return view;
+    }
+    public static Fragment3 erstellen(String text) {
+        Fragment3 fragment = new Fragment3();
+        Bundle b = new Bundle();
+        b.putString(KEY_TEXT, text);
+        fragment.setArguments(b);
+        return fragment;
+    }
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        Bundle args = getArguments();
+        if (args != null) {
+            text = args.getString(KEY_TEXT);
+            log("onCreate: text=" + text);
+        } else {
+            log("onCreate");
+        }
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.example.ueberwachungssystem.Logger;
+
+import android.util.Log;
+import android.widget.TextView;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class Logger {
+    private TextView textView;
+    private StringBuffer sb = new StringBuffer();
+    private String tag;
+
+    public Logger(String tag, TextView textView, String logInitText)  {
+        this.tag = tag;
+        this.textView = textView;
+        sb.append(logInitText);
+    }
+
+    public void log(String s)  {
+        Log.d(tag, s);
+        sb.append(s).append("\n");
+        if (textView != null) {
+            textView.setText(sb.toString());
+        }
+    }
+
+    public void log(Exception e)  {
+        StringWriter sw = new StringWriter();
+        e.printStackTrace(new PrintWriter(sw));
+        log(sw.toString());
+    }
+
+    public void clearLog()  {
+        sb.setLength(0);
+        if (textView != null) {
+            textView.setText("");
+        }
+    }
+
+    public String getLoggedText()  {
+        return sb.toString();
+    }
+}

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

@@ -1,67 +1,158 @@
 package com.example.ueberwachungssystem;
 
+import static android.content.ContentValues.TAG;
+
+import android.annotation.SuppressLint;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.util.Log;
+import android.view.MenuItem;
+import android.widget.Toast;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ToggleButton;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.camera.core.ExperimentalGetImage;
 
-import android.os.Bundle;
+import com.example.ueberwachungssystem.Detection.DetectionReport;
-import android.util.Log;
+import com.example.ueberwachungssystem.Detection.DetectorService;
-import android.view.View;
-import android.widget.Switch;
-import android.widget.TextView;
-
-import com.example.ueberwachungssystem.Detector.DetectionReport;
-import com.example.ueberwachungssystem.Detector.Detector;
-import com.example.ueberwachungssystem.Detector.MicrophoneDetector;
-import com.jjoe64.graphview.GraphView;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 
+@ExperimentalGetImage
 public class MainActivity extends AppCompatActivity {
-    private TextView tv_log;
-    MicrophoneDetector Mic;
-    private Switch TglBtn_Mic;
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        tv_log = (TextView) findViewById(R.id.tv_log); //Set textview for showing logged content
-        Log.d("Main",this.getClass().getSimpleName() + ".onCreate");
-        Mic = new MicrophoneDetector(this);
-        setupMic();
-        Mic.setOnDetectionListener(new Detector.OnDetectionListener() {
-            @Override
-            public void onDetection(@NonNull DetectionReport detectionReport) {
-                Log.d("Main", "Detection erkannt!");
-            }
-        });
 
-    }
+    //WifiCommunication communication;
+    PermissionRequest permission;
+    boolean communicationRunning = true;
+    TextView textview1;
 
-    @Override
+    private DetectorService detectorService = new DetectorService();
-    public void onResume() {
-        super.onResume();
-        Log.d("Main",this.getClass().getSimpleName() + ".onResume");
-    }
 
-    @Override
+        @Override
-    public void onPause() {
+        protected void onCreate(Bundle savedInstanceState) {
-        super.onPause();
+            super.onCreate(savedInstanceState);
-        Log.d("Main",this.getClass().getSimpleName() + ".onPause");
+            setContentView(R.layout.activity_main);
-    }
 
-    private void setupMic() {
+            Intent serviceIntent = new Intent(this, DetectorService.class);
-        TglBtn_Mic = (Switch) findViewById(R.id.TglBtn_Mic);
+            bindService(serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE);
-        TglBtn_Mic.setOnClickListener(new View.OnClickListener() {
+            startService(serviceIntent);
-            @Override
+            ToggleButton button1 = findViewById(R.id.toggleButton);
-            public void onClick(View v) {
+            button1.setOnClickListener(new View.OnClickListener() {
-                if (v == TglBtn_Mic) {
+                @Override
-                    Log.d("Main","onClick toggleButtonThread " + TglBtn_Mic.isChecked());
+                public void onClick(View v) {
-                    if (TglBtn_Mic.isChecked()) {
+                    if(button1.isChecked()){
-                        Mic.startDetection();
+                        if(detectorService != null){
-                    } else {
+                            detectorService.videoDetector.startDetection();
-                        Mic.stopDetection();
+                        }
+                    }else{
+                        detectorService.videoDetector.stopDetection();
                     }
                 }
+            });
+            //textview1 = findViewById(R.id.textView1);
+
+            //Button button1 = findViewById(R.id.buttonSend);
+            /*button1.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    communication.sendTrue("Testmessage");
+                }
+            });*/
+        }
+
+        private ServiceConnection serviceConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                DetectorService.ServiceBinder binder = (DetectorService.ServiceBinder) service;
+                detectorService = binder.getBoundService();
+
+                detectorService.setOnDetectionListener(new DetectorService.OnDetectionListener() {
+                    @Override
+                    public void onDetection(StringBuffer stringBuffer) {
+                        //textview für oli
+                        Log.d("Debugger", stringBuffer.toString());
+                    }
+                });
             }
-        });
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+
+            }
+        };
+    @Override
+    protected void onResume() {
+        super.onResume();
+        /*if (communicationRunning){
+            communication = new WifiCommunication(1234);
+            communication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
+                @Override
+                public void onConnection(String data) {
+                    //Log.d("Test", data.toString());
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            textview1.setText(data);
+                        }
+                    });
+                }
+            });
+            communicationRunning = false;
+        }*/
+        permission = new PermissionRequest(MainActivity.this);
+        permission.rechtePruefen();
+        }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        //communication.stopCommunication();
     }
-}
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.options_menu, menu);
+        return true;
+    }
+    /*public boolean onOptionsItemSelected(MenuItem item) {
+        Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
+        PopUpClass popUpClass;
+        switch (item.getItemId()) {
+            case R.id.Rechteverwaltung:
+                popUpClass = new PopUpClass(MainActivity.this);
+                popUpClass.showPopupWindow(textview1);
+                popUpClass.RechtePrüfen();
+                return true;
+            case R.id.Sensoren:
+                popUpClass = new PopUpClass(MainActivity.this);
+                popUpClass.showPopupWindow(textview1);
+                popUpClass.Sensoren();
+                return true;
+            case R.id.Impressum:
+                popUpClass = new PopUpClass(MainActivity.this);
+                popUpClass.showPopupWindow(textview1);
+                popUpClass.Impressum();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }*/
+
+}
+

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

@@ -0,0 +1,43 @@
+package com.example.ueberwachungssystem;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.widget.Toast;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+public class PermissionHandler {
+    private final Context context;
+    private static final int PERMISSION_REQUEST_CODE = 23409;
+    private static final String[] permissions = new String[]{
+            android.Manifest.permission.CAMERA,
+            android.Manifest.permission.RECORD_AUDIO
+    };
+
+    public PermissionHandler(Context context) {
+        this.context = context;
+    }
+
+    public boolean hasPermissions() {
+        boolean permissionState = true;
+        for (String permission: permissions) {
+            permissionState = permissionState && ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED;
+        }
+        return permissionState;
+    }
+
+    public void getPermissions() {
+        if (!hasPermissions())
+            ActivityCompat.requestPermissions((Activity) context, permissions, PERMISSION_REQUEST_CODE);
+    }
+
+    public void showPermissionToast() {
+        if (hasPermissions())
+            Toast.makeText(context, "permissions available", Toast.LENGTH_SHORT).show();
+        else
+            Toast.makeText(context, "permissions missing", Toast.LENGTH_SHORT).show();
+    }
+}

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

@@ -0,0 +1,48 @@
+package com.example.ueberwachungssystem;
+
+import static android.Manifest.permission.INTERNET;
+import static android.Manifest.permission.CAMERA;
+import static android.Manifest.permission.RECORD_AUDIO;
+
+import android.content.pm.PackageManager;
+import android.os.Handler;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.ContextCompat;
+
+public class PermissionRequest extends AppCompatActivity{
+    private static final int PERMISSION_REQUEST_CODE = 123;
+    private final MainActivity mainActivity;
+
+    Handler handler = new Handler();
+
+    public PermissionRequest(MainActivity mainActivity) {
+        this.mainActivity = mainActivity;
+    }
+
+    public StringBuilder rechtePruefen() {
+        boolean rechtKamera = ContextCompat.checkSelfPermission(mainActivity, CAMERA) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtMikrofon = ContextCompat.checkSelfPermission(mainActivity, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
+        boolean rechtInternet = ContextCompat.checkSelfPermission(mainActivity, INTERNET) == PackageManager.PERMISSION_GRANTED;
+        StringBuilder sb = new StringBuilder();
+        sb.append("Rechte prüfen:")
+                .append("\nKamera: ").append(rechtKamera)
+                .append("\nMikrofon: ").append(rechtMikrofon)
+                .append("\nInternet: ").append(rechtInternet);
+        //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(sb));
+        if (!(rechtKamera && rechtMikrofon && rechtInternet)){
+            handler.post(new Runnable() {
+                @Override
+                public void run() {
+                    Toast.makeText(mainActivity.getApplicationContext(),"Es werden Rechte benötigt", Toast.LENGTH_LONG).show();
+                }
+            });
+        }
+        return sb;
+    }
+
+    public void rechteAnfordern() {
+        mainActivity.requestPermissions(new String[]{CAMERA, RECORD_AUDIO, INTERNET}, PERMISSION_REQUEST_CODE);
+    }
+}

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

@@ -0,0 +1,85 @@
+package com.example.ueberwachungssystem;
+
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+public class PopUpClass {
+    private final MainActivity mainActivity;
+
+    PermissionRequest permission;
+    TextView PopUpText;
+
+
+    public PopUpClass(MainActivity mainActivity) {
+        this.mainActivity = mainActivity;
+        permission = new PermissionRequest(mainActivity);
+    }
+
+    //PopupWindow display method
+
+    public void showPopupWindow(final View view) {
+
+
+        //Create a View object yourself through inflater
+        LayoutInflater inflater = (LayoutInflater) view.getContext().getSystemService(view.getContext().LAYOUT_INFLATER_SERVICE);
+        View popupView = inflater.inflate(R.layout.popup_window, null);
+
+        //Specify the length and width through constants
+        int width = LinearLayout.LayoutParams.WRAP_CONTENT;
+        int height = LinearLayout.LayoutParams.WRAP_CONTENT;
+
+        //Make Inactive Items Outside Of PopupWindow
+        boolean focusable = true;
+
+        //Create a window with our parameters
+        final PopupWindow popupWindow = new PopupWindow(popupView,width*1, height*1, focusable);
+
+        //Set the location of the window on the screen
+        popupWindow.showAtLocation(view, Gravity.CENTER, 0, 0);
+
+        //Initialize the elements of our window, install the handler
+
+        PopUpText = popupView.findViewById(R.id.titleText);
+
+        Button buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
+        buttonEdit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {RechteAnfordern();
+            }
+        });
+
+        //Handler for clicking on the inactive zone of the window
+
+        popupView.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+
+                //Close the window when clicked
+                popupWindow.dismiss();
+                return true;
+            }
+        });
+    }
+    public void RechtePrüfen(){
+        StringBuilder Text = permission.rechtePruefen();
+        PopUpText.setText(Text);
+    }
+    public void RechteAnfordern(){
+        permission.rechteAnfordern();
+        StringBuilder Text = permission.rechtePruefen();
+        PopUpText.setText(Text);
+    }
+    public void Sensoren(){
+        PopUpText.setText("Es können 3 verschiedene Sensoren verwendet werden \n -1. Beschleunigungssensor\n -2. Mikrofon\n -3. Kamera");
+    }
+    public void Impressum(){
+        PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert");
+    }
+
+}

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

@@ -0,0 +1,147 @@
+package com.example.ueberwachungssystem;
+import android.annotation.SuppressLint;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+
+import com.example.ueberwachungssystem.Detection.DetectionReport;
+import com.example.ueberwachungssystem.Detection.Detector;
+import com.example.ueberwachungssystem.Detection.DetectorService;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Enumeration;
+
+public class WifiCommunication {
+    //private final MainActivity mainActivity;
+    private final InetAddress address;
+    private final int port;
+
+    private String messageToSend;
+    volatile private boolean send;
+    private final DatagramSocket socket;
+    volatile private boolean running;
+
+    private OnConnectionListener listener;
+    @SuppressLint("SetTextI18n")
+    public WifiCommunication(int port) {
+        //this.mainActivity = mainActivity;
+        this.port = port;
+        try {
+            socket = new DatagramSocket(this.port);
+            socket.setBroadcast(true);
+            address = InetAddress.getByName("255.255.255.255"); //100.82.255.255
+            running = true;
+            send = false;
+            new ReceiveThread().start();
+            new SendThread().start();
+        } catch (SocketException | UnknownHostException e) {
+            throw new RuntimeException(e);
+        }
+        //Toast.makeText(mainActivity.getApplicationContext(),"Communication running", Toast.LENGTH_SHORT).show();
+        //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText("Communication running"));
+    }
+
+    public interface OnConnectionListener {
+        void onConnection(String data);
+    }
+    public void setOnConnectionListener(@NonNull OnConnectionListener listener) {
+        this.listener = listener;
+    }
+
+    public void sendWifiData(String wifiMessage) {
+        if (listener != null) {
+            listener.onConnection(wifiMessage);
+        }
+    }
+
+    private class ReceiveThread extends Thread {
+        private StringBuffer rxStringBuffer = new StringBuffer();
+        private String rxString="";
+        private String previousRxString = "";
+
+        @Override
+        public void run() {
+            try {
+                do {
+                    byte[] receiveData = new byte[512];
+                    DatagramPacket rxPacket = new DatagramPacket(receiveData, receiveData.length);
+                    socket.receive(rxPacket);
+                    rxString = new String(receiveData, 0, rxPacket.getLength());
+                    String[] splitrxString = rxString.split(",");
+                    Log.d("empfangen", rxString);
+                    if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7) {
+                        //rxStringBuffer.append(rxString).append("\n");
+                        sendWifiData(rxString);
+
+                        //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
+                        previousRxString = rxString;
+                    }
+                } while (running);
+            }
+            catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    private class SendThread extends Thread {
+        private int tmpCnt = 0;
+        @Override
+        public void run() {
+            try {
+                do {
+                    if(send)
+                    {
+                        send = false;
+                        byte[] send_Data = new byte[512];
+                        String txString = (messageToSend);
+                        send_Data = txString.getBytes();
+
+                        DatagramPacket txPacket = new DatagramPacket(send_Data, txString.length(), address, port);
+
+                        for(int i = 0; i < 500; i++) {
+                            socket.send(txPacket);
+                            Log.d("senden", txPacket.getData().toString());
+                        }
+                    }
+                } while (running);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    public static String getLocalIpAddress() {
+        try {
+            for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
+                NetworkInterface networkInterface = (NetworkInterface) ((Enumeration<?>) en).nextElement();
+                for (Enumeration<InetAddress> addresses = networkInterface.getInetAddresses(); addresses.hasMoreElements();) {
+                    InetAddress inetAddress = addresses.nextElement();
+                    if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
+                        return inetAddress.getHostAddress();
+                    }
+                }
+            }
+        } catch (SocketException ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
+    public void sendTrue(String message){
+        send = true;
+        messageToSend = message;
+    }
+    public void stopCommunication() {
+        running = false;
+        socket.close();
+    }
+}

app/src/main/res/layout-land/activity_main_land.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

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

@@ -1,26 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:gravity="top"
+    android:orientation="vertical"
     tools:context=".MainActivity">
 
-    <TextView
+
-        android:id="@+id/tv_log"
+    <androidx.camera.view.PreviewView
+        android:id="@+id/previewView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:backgroundTint="@android:color/black"/>
+
+    <ToggleButton
+        android:id="@+id/toggleButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="ToggleButton" />
+
+    <ImageView
+        android:id="@+id/inputImageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Log"
+        tools:srcCompat="@tools:sample/avatars" />
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/TglBtn_Mic" />
 
-    <Switch
+    <ImageView
-        android:id="@+id/TglBtn_Mic"
+        android:id="@+id/outputImageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Mic"
+        tools:srcCompat="@tools:sample/avatars" />
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <androidx.camera.view.PreviewView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:background="@android:color/holo_green_light">
+
+    <TextView
+        android:id="@+id/Sensor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    <TextView
+        android:id="@+id/Alarm"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/Sensor"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+</RelativeLayout>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:background="@android:color/holo_blue_light" >
+
+    <TextView
+        android:id="@+id/Sensor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    <TextView
+        android:id="@+id/Alarm"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/Sensor"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+</LinearLayout>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:background="@android:color/holo_blue_light" >
+
+    <TextView
+        android:id="@+id/Sensor"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+    <TextView
+        android:id="@+id/Alarm"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/Sensor"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+</LinearLayout>

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:gravity="center"
+    android:background="#A5ACB2">
+
+    <TextView
+        android:id="@+id/titleText"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp"
+        android:textStyle="italic"
+        android:padding="10dp"/>
+
+    <Button
+        android:id="@+id/RechteAnfordern"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="Rechte Anfordern" />
+
+
+
+</LinearLayout>

app/src/main/res/menu/options_menu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/Rechteverwaltung"
+        android:title="Rechteverwaltung" />
+    <item android:id="@+id/Sensoren"
+        android:title="Sensoren" />
+    <item android:id="@+id/Impressum"
+        android:title="Impressum" />
+</menu>

build.gradle

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.0' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.library' version '8.0.0' apply false
 }

gradle.properties

@@ -19,4 +19,5 @@ android.useAndroidX=true
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu May 11 15:04:30 CEST 2023
+#Thu May 11 15:19:24 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -14,3 +14,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Ueberwachungssystem"
 include ':app'
+include ':app'