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

@@ -1,108 +0,0 @@
-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/DetectionReport.java

@@ -1,13 +1,8 @@
 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 {
@@ -17,11 +12,7 @@ public class DetectionReport {
     public boolean detectionState;
 
     public DetectionReport(boolean detectionState, String detectionType, float detectedAmplitude) {
-        // New Date Format
+        this.timeStamp = String.valueOf(Calendar.getInstance().getTime());
-        @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;
@@ -40,16 +31,6 @@ public class DetectionReport {
         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

@@ -12,7 +12,7 @@ abstract public class Detector {
     private boolean extendViolation = false;
 
     // Countdown parameters
-    private final int COUNTDOWN_TIME = 5000;          // milliseconds
+    private final int COUNTDOWN_TIME = 10000;          // milliseconds
     private final int COUNTDOWN_POLLING_TIME = 100;   // milliseconds
 
     /** Constructor - takes context of current activity */

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

@@ -5,6 +5,7 @@ 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;
@@ -21,96 +22,45 @@ public class DetectorService extends LifecycleService {
     private DetectorService.OnDetectionListener listener;
     private boolean isServiceRunning = false;
 
-    // Used Objects:
+    VideoDetector videoDetector = null;
-    public VideoDetector videoDetector = null;
+    AudioRecorder audioRecorder = null;
-    public AudioRecorder audioRecorder = null;
-    public Accelerometer motionDetector = null;
-    public MicrophoneDetector audioDetector = null;
 
-    public WifiCommunication wifiCommunication;
+    /** Communication **/
 
+    WifiCommunication wifiCommunication;
 
-    String wifiData;
+    StringBuffer dataFromWifi;
-    StringBuffer stringBufferWifi = new StringBuffer();
-
-    String typOfAlarm;
-
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (isServiceRunning)
             return START_NOT_STICKY;
 
-        /** Wifi Instanz **/
-        wifiCommunication = new WifiCommunication(1234);
-        wifiCommunication.sendTrue("TEst");
 
-        wifiCommunication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
+        // Setup Service classes:
-            @Override
-            public void onConnection(String data) {
-                Log.d("Listener", data);
-                wifiData = data;
-                stringToStringbuffer(data);
-                Log.d("buffer",stringBufferWifi.toString());
-                passToServiceListener(stringBufferWifi);
-                checkState(data);
-                checkTyp(data);
-            }
-        });
-
-
-
-
-
-        /** Video Detection/Recorder **/
         videoDetector = new VideoDetector(this);
         videoDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                //passToServiceListener(detectionReport);
+                passToServiceListener(detectionReport);
-
-                if(detectionReport.detectionState){
-                    videoDetector.startRecording();
-                } else {
-                    videoDetector.stopRecording();
-                }
-
-                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);
-                wifiCommunication.sendTrue(detectionReport.toMessage());
-            }
-        });
-        /** Audio Detection **/
-        audioDetector = new MicrophoneDetector(this);
-        audioDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
-            @Override
-            public void onDetection(@NonNull DetectionReport detectionReport) {
-                //passToServiceListener(detectionReport);
-                wifiCommunication.sendTrue(detectionReport.toMessage());
-            }
-        });
-        /** Audio Recorder**/
         audioRecorder = new AudioRecorder(this);
 
 
 
-
-
-
         isServiceRunning = true;
+
+        wifiCommunication = new WifiCommunication (1234);
+        wifiCommunication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
+            @Override
+            public void onConnection(StringBuffer data) {
+                dataFromWifi = data;
+            }
+        });
         return super.onStartCommand(intent, flags, startId);
     }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -132,45 +82,93 @@ public class DetectorService extends LifecycleService {
     }
 
 
-    /** Pass Detection Report to Service Detection Listener and trigger it */
+    /** Video Detection */
-    public void passToServiceListener(StringBuffer stringBuffer) {
+    public void startVideoDetection() {
+        if(videoDetector != null)
+            videoDetector.startDetection();
+    }
+    public void stopVideoDetection() {
+        if(videoDetector != null)
+            videoDetector.stopDetection();
+    }
+    public boolean isVideoDetectionRunning() {
+        if(videoDetector != null)
+           return videoDetector.isDetecting();
+        return false;
+    }
+    public void debugVideoProcessing(ImageView input, ImageView output) {
+        if(videoDetector != null)
+            videoDetector.debugProcessing(input, output);
+    }
+
+    /** Audio Detection */
+    public void startAudioDetection() {
+
+    }
+    public void stopAudioDetection() {
+
+    }
+
+    /** Motion Detection */
+    public void startMotionDetection() {
+
+    }
+    public void stopMotionDetection() {
+
+    }
+
+    /** Video Recording */
+    public void startVideoRecording() {
+        if(videoDetector != null)
+            videoDetector.startRecording();
+    }
+    public void stopVideoRecording() {
+        if(videoDetector != null)
+            videoDetector.stopRecording();
+    }
+    public boolean isVideoRecordingRunning() {
+        if(videoDetector != null)
+            return videoDetector.isRecording();
+        return false;
+    }
+    public void setVideoRecordingDir(File outputDir) {
+        if (videoDetector != null)
+            videoDetector.setOutputDir(outputDir);
+    }
+
+    /** Audio Recording */
+    public void startAudioRecording() {
+        if(audioRecorder != null)
+            audioRecorder.startRecording();
+    }
+    public void stopAudioRecording() {
+        if(audioRecorder != null)
+            audioRecorder.stopRecording();
+    }
+    public boolean isAudioRecordingRunning() {
+        if(videoDetector != null)
+            return audioRecorder.isRecording();
+        return false;
+    }
+    public void setAudioRecordingDir(File outputDir) {
+        if (audioRecorder != null)
+            audioRecorder.setOutputDir(outputDir);
+    }
+
+
+    /** pass Detection Report to Service Detection Listener and trigger it */
+    public void passToServiceListener(DetectionReport detectionReport) {
         if (listener != null) {
-            listener.onDetection(stringBuffer);
+            listener.onDetection(detectionReport);
         }
     }
 
 
     /** On Detection Listener - runs when violation is reported */
     public interface OnDetectionListener {
-        void onDetection(@NonNull StringBuffer stringBuffer);
+        void onDetection(@NonNull DetectionReport detectionReport);
     }
     public void setOnDetectionListener(@NonNull DetectorService.OnDetectionListener listener) {
         this.listener = listener;
     }
-
-    public void stringToStringbuffer(String string){
-        if(string != null) {
-            stringBufferWifi.insert(0,string + "\n");
-        }
-    }
-
-    public String[] splitString(String string){
-        String[] splitrxString = string.split(",");
-        return splitrxString; //splitrxString[0] = "1",splitrxString[1] = "HH:MM:SS", splitrxString[0].equals("1")
-
-    }
-
-
-    public boolean checkState(String string){
-        Log.d("state", String.valueOf(splitString(string)[4].equals("An")));
-        return splitString(string)[4].equals("An");
-    }
-
-    public String checkTyp(String string){
-        if (splitString(string)[5] != null) {
-            typOfAlarm = splitString(string)[5];
-            Log.d("Type",  typOfAlarm);
-        }
-        return typOfAlarm;
-    }
 }

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

@@ -1,365 +0,0 @@
-package com.example.ueberwachungssystem.Detection;
-
-import static java.lang.Math.*;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.media.AudioFormat;
-import android.media.AudioRecord;
-import android.media.MediaRecorder;
-import android.os.AsyncTask;
-import android.util.Log;
-
-import com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex;
-import com.example.ueberwachungssystem.Detection.Signalverarbeitung.FFT;
-
-public class MicrophoneDetector extends Detector {
-    /**
-     * Constructor - takes context of current activity
-     *
-     * @param context
-     */
-
-    private AufnahmeTask aufnahmeTask;
-    public boolean armed = false;
-    public int schwellwertAlarm = 100;
-    private Context context;
-
-    public MicrophoneDetector(Context context) {
-        super();
-        this.context = context;
-    }
-
-    @Override
-    public void startDetection() {
-        aufnahmeTask = new AufnahmeTask();
-        aufnahmeTask.execute();
-    }
-
-    @Override
-    public void stopDetection() {
-        if (aufnahmeTask != null) {
-            aufnahmeTask.cancel(true);
-        }
-    }
-
-    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 = 2000;
-        private final int threadSleeptime = 10;
-        private int minPufferGroesseInBytes;
-        private int pufferGroesseInBytes;
-        private RingPuffer ringPuffer = new RingPuffer(10);
-        private float kalibierWert;
-        private com.example.ueberwachungssystem.Detection.DetectionReport detectionReport;
-
-
-
-        @SuppressLint("MissingPermission")
-        AufnahmeTask() {
-            minPufferGroesseInBytes = AudioRecord.getMinBufferSize(sampleRateInHz, channelConfig, audioFormat);
-            pufferGroesseInBytes = minPufferGroesseInBytes * 2;
-            try {
-                recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRateInHz, channelConfig, audioFormat, pufferGroesseInBytes);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            Log.d("0","Puffergroeße: "+ minPufferGroesseInBytes + " " + pufferGroesseInBytes);
-            Log.d("0","Recorder (SR, CH): "+ recorder.getSampleRate() + " " + recorder.getChannelCount());
-
-            int anzahlBytesProAbtastwert;
-            String s;
-            switch (recorder.getAudioFormat()) {
-                case AudioFormat.ENCODING_PCM_8BIT:
-                    s = "8 Bit PCM ";
-                    anzahlBytesProAbtastwert = 1;
-                    break;
-                case AudioFormat.ENCODING_PCM_16BIT:
-                    s = "16 Bit PCM";
-                    anzahlBytesProAbtastwert = 2;
-                    break;
-                case AudioFormat.ENCODING_PCM_FLOAT:
-                    s = "Float PCM";
-                    anzahlBytesProAbtastwert = 4;
-                    break;
-                default:
-                    throw new IllegalArgumentException();
-            }
-
-            switch (recorder.getChannelConfiguration()) {
-                case AudioFormat.CHANNEL_IN_MONO:
-                    s = "Mono";
-                    break;
-                case AudioFormat.CHANNEL_IN_STEREO:
-                    s = "Stereo";
-                    anzahlBytesProAbtastwert *= 2;
-                    break;
-                case AudioFormat.CHANNEL_INVALID:
-                    s = "ungültig";
-                    break;
-                default:
-                    throw new IllegalArgumentException();
-            }
-
-            Log.d("0","Konfiguration: "+ s);
-
-        }
-
-        @Override
-        protected Void doInBackground(Long... params) {
-            recorder.startRecording();
-            short[] puffer = new short[pufferGroesseInBytes / 2];
-            long lastTime = System.currentTimeMillis();
-            float verarbeitungsrate = 0;
-            final int maxZaehlerZeitMessung = 10;
-            int zaehlerZeitMessung = 0;
-            int anzahlVerarbeitet = 0;
-            GleitenderMittelwert gleitenderMittelwert = new GleitenderMittelwert(0.3f);
-
-            //Kalibrierung
-            try {
-                Thread.sleep(startDelay); // Time to lay down the phone
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            int i = 0;
-            for (i = 0; i < 20; i++) {
-                int n = recorder.read(puffer, 0, puffer.length);
-                Verarbeitungsergebnis kalibrierErgebnis = verarbeiten(puffer, n);
-                kalibierWert += kalibrierErgebnis.maxAmp;
-                try {
-                    Thread.sleep(threadSleeptime);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
-            kalibierWert = kalibierWert/i;
-
-//            __Part of FFT__
-//            Complex[] zeitSignal = new Complex[puffer.length];
-//            for (int j = 0; j < puffer.length; j++) {
-//                zeitSignal[j] = new Complex(puffer[j], 0);
-//            }
-//            Complex[] spektrum = FFT.fft(zeitSignal);
-//            double[] spektrum = calculateFFT(puffer);
-//            DataPoint AddPoint;
-//            LineGraphSeries<DataPoint> series = new LineGraphSeries<DataPoint>(new DataPoint[]{});
-//            for (i = 0; i < spektrum.length; i++) {
-//                AddPoint = new DataPoint(i, spektrum[i]);
-//                series.appendData(AddPoint, true, spektrum.length);
-//            }
-//            graph.addSeries(series);
-
-            for (; ; ) {
-                if (aufnahmeTask.isCancelled()) {
-                    break;
-                } else {
-                    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[]{});
-//                    for (i = 0; i < spektrum.length; i++) {
-//                        AddPoint = new DataPoint(i, spektrum[i]);
-//                        newseries.appendData(AddPoint, true, spektrum.length);
-//                    }
-
-                    zaehlerZeitMessung++;
-                    if (zaehlerZeitMessung == maxZaehlerZeitMessung) {
-                        long time = System.currentTimeMillis();
-                        long deltaTime = time - lastTime;
-                        verarbeitungsrate = 1000.0f * anzahlVerarbeitet / deltaTime;
-                        verarbeitungsrate = gleitenderMittelwert.mittel(verarbeitungsrate);
-                        zaehlerZeitMessung = 0;
-                        anzahlVerarbeitet = 0;
-                        lastTime = time;
-                    }
-
-
-                    ergebnis.verarbeitungsrate = (int) verarbeitungsrate;
-                    publishProgress(ergebnis);
-
-                    try {
-                        Thread.sleep(threadSleeptime);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-            recorder.release();
-            return null;
-        }
-
-        private Verarbeitungsergebnis verarbeiten(short[] daten, int n) {
-            String status;
-            short maxAmp = -1;
-            if (n == AudioRecord.ERROR_INVALID_OPERATION) {
-                status = "ERROR_INVALID_OPERATION";
-            } else if (n == AudioRecord.ERROR_BAD_VALUE) {
-                status = "ERROR_BAD_VALUE";
-            } else {
-                status = "OK";
-                short max = 0;
-                for (int i = 0; i < n; i++) {
-                    if (daten[i] > max) {
-                        max = daten[i];
-                    }
-                }
-
-                ringPuffer.hinzufuegen(max);
-                maxAmp = ringPuffer.maximum();
-                if (maxAmp <= schwellwertAlarm + kalibierWert) {
-                    armed = true;
-                }
-            }
-
-            return new Verarbeitungsergebnis(status, maxAmp, 0);
-        }
-
-        @Override
-        protected void onProgressUpdate(Verarbeitungsergebnis... progress) {
-            super.onProgressUpdate(progress);
-            float maxAmpPrint = round(20*log10(abs(progress[0].maxAmp/1.0)));
-            float kalibierWertPrint = round(20*log10(abs(kalibierWert)));
-            Log.d("alarmAudio","VR: " + progress[0].verarbeitungsrate + ", Amp: " + maxAmpPrint
-            + " dB, Kal: " + kalibierWertPrint + " dB");
-
-            if (progress[0].maxAmp >= schwellwertAlarm + kalibierWert && armed == true) {
-                armed = false;
-                detectionReport = new DetectionReport(true, "Audio", maxAmpPrint);
-                reportViolation("Audio", maxAmpPrint);
-                Log.d("1",detectionReport.toString());
-            }
-        }
-    }
-
-    private double[] calculateFFT(short[] zeitsignal)
-    {
-        byte signal[] = new byte[zeitsignal.length];
-        // loops through all the values of a Short
-        for (int i = 0; i < zeitsignal.length-1; i++) {
-            signal[i] = (byte) (zeitsignal[i]);
-            signal[i+1] = (byte) (zeitsignal[i] >> 8);
-        }
-
-        final int mNumberOfFFTPoints =1024;
-
-        double temp;
-        Complex[] y;
-        Complex[] complexSignal = new Complex[mNumberOfFFTPoints];
-        double[] absSignal = new double[mNumberOfFFTPoints/2];
-
-        for(int i = 0; i < mNumberOfFFTPoints; i++){
-            temp = (double)((signal[2*i] & 0xFF) | (signal[2*i+1] << 8)) / 32768.0F;
-            complexSignal[i] = new Complex(temp,0.0);
-        }
-
-        y = FFT.fft(complexSignal);
-
-        for(int i = 0; i < (mNumberOfFFTPoints/2); i++)
-        {
-            absSignal[i] = y[i].abs();
-        }
-
-        return absSignal;
-
-    }
-
-    class Verarbeitungsergebnis {
-        String status;
-        short maxAmp;
-        int verarbeitungsrate;
-        Verarbeitungsergebnis(String status, short maxAmp, int verarbeitungsrate) {
-            this.status = status;
-            this.maxAmp = maxAmp;
-            this.verarbeitungsrate = verarbeitungsrate;
-        }
-    }
-
-    class RingPuffer {
-        private short[] puffer;
-        private final int laenge;
-        private int anzahlEnthaltenerDaten;
-        private int position;
-
-        public RingPuffer(int n) {
-            laenge = n;
-            anzahlEnthaltenerDaten = 0;
-            position = 0;
-            puffer = new short[laenge];
-        }
-
-        public void hinzufuegen(short wert) {
-            puffer[position] = wert;
-            position++;
-            if (position >= laenge) {
-                position = 0;
-            }
-            if (anzahlEnthaltenerDaten < laenge) {
-                anzahlEnthaltenerDaten++;
-            }
-        }
-
-        public void hinzufuegen(short[] daten) {
-            for (short d : daten) {
-                puffer[position] = d;
-                position++;
-                if (position >= laenge) {
-                    position = 0;
-                }
-            }
-            if (anzahlEnthaltenerDaten < laenge) {
-                anzahlEnthaltenerDaten += daten.length;
-                if (anzahlEnthaltenerDaten >= laenge) {
-                    anzahlEnthaltenerDaten = laenge;
-                }
-            }
-        }
-
-        public short maximum() {
-            short max = 0;
-            for (int i = 0; i < anzahlEnthaltenerDaten; i++) {
-                if (puffer[i] > max) {
-                    max = puffer[i];
-                }
-            }
-            return max;
-        }
-
-        public float mittelwert() {
-            float summe = 0;
-            for (int i = 0; i < anzahlEnthaltenerDaten; i++) {
-                summe += puffer[i];
-            }
-            return summe / anzahlEnthaltenerDaten;
-        }
-    }
-
-    class GleitenderMittelwert {
-        private final float wichtungNeuerWert;
-        private final float wichtungAlterWert;
-        private float mittelwert = 0;
-        private boolean istMittelwertGesetzt = false;
-
-        GleitenderMittelwert(float wichtungNeuerWert) {
-            this.wichtungNeuerWert = wichtungNeuerWert;
-            this.wichtungAlterWert = 1 - this.wichtungNeuerWert;
-        }
-
-        float mittel(float wert) {
-            if (istMittelwertGesetzt) {
-                mittelwert = wert * wichtungNeuerWert + mittelwert * wichtungAlterWert;
-            } else {
-                mittelwert = wert;
-                istMittelwertGesetzt = true;
-            }
-            return mittelwert;
-        }
-    }
-}

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

@@ -1,148 +0,0 @@
-package com.example.ueberwachungssystem.Detection.Signalverarbeitung;
-
-import java.util.Objects;
-
-public class Complex {
-    private final double re;   // the real part
-    private final double im;   // the imaginary part
-
-    // create a new object with the given real and imaginary parts
-    public Complex(double real, double imag) {
-        re = real;
-        im = imag;
-    }
-
-    // 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";
-        if (im < 0) return re + " - " + (-im) + "i";
-        return re + " + " + im + "i";
-    }
-
-    // return abs/modulus/magnitude
-    public double abs() {
-        return Math.hypot(re, im);
-    }
-
-    // return angle/phase/argument, normalized to be between -pi and pi
-    public double phase() {
-        return Math.atan2(im, re);
-    }
-
-    // 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;
-        double imag = a.im + b.im;
-        return new Complex(real, imag);
-    }
-
-    // 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;
-        double imag = a.im - b.im;
-        return new Complex(real, imag);
-    }
-
-    // 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;
-        double imag = a.re * b.im + a.im * b.re;
-        return new Complex(real, imag);
-    }
-
-    // return a new object whose value is (this * alpha)
-    public Complex scale(double alpha) {
-        return new Complex(alpha * re, alpha * im);
-    }
-
-    // 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.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);
-    }
-
-    // return the real or imaginary part
-    public double re() {
-        return re;
-    }
-
-    public double im() {
-        return im;
-    }
-
-    // return a / b
-    public Complex divides(Complex b) {
-        Complex a = this;
-        return a.times(b.reciprocal());
-    }
-
-    // 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.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.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.Detection.Signalverarbeitung.Complex object whose value is the complex tangent of this
-    public Complex tan() {
-        return sin().divides(cos());
-    }
-
-    // a static version of plus
-    public static Complex plus(Complex a, Complex b) {
-        double real = a.re + b.re;
-        double imag = a.im + b.im;
-        Complex sum = new Complex(real, imag);
-        return sum;
-    }
-
-    // See Section 3.3.
-    public boolean equals(Object x) {
-        if (x == null) return false;
-        if (this.getClass() != x.getClass()) return false;
-        Complex that = (Complex) x;
-        return (this.re == that.re) && (this.im == that.im);
-    }
-
-    // See Section 3.3.
-    public int hashCode() {
-        return Objects.hash(re, im);
-    }
-
-    // sample client for testing
-    public static void main(String[] args) {
-        Complex a = new Complex(5.0, 6.0);
-        Complex b = new Complex(-3.0, 4.0);
-
-        System.out.println("a            = " + a);
-        System.out.println("b            = " + b);
-        System.out.println("Re(a)        = " + a.re());
-        System.out.println("Im(a)        = " + a.im());
-        System.out.println("b + a        = " + b.plus(a));
-        System.out.println("a - b        = " + a.minus(b));
-        System.out.println("a * b        = " + a.times(b));
-        System.out.println("b * a        = " + b.times(a));
-        System.out.println("a / b        = " + a.divides(b));
-        System.out.println("(a / b) * b  = " + a.divides(b).times(b));
-        System.out.println("conj(a)      = " + a.conjugate());
-        System.out.println("|a|          = " + a.abs());
-        System.out.println("tan(a)       = " + a.tan());
-    }
-}

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

@@ -1,246 +0,0 @@
-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.Detection.Signalverarbeitung.Complex.java
- *
- *  Compute the FFT and inverse FFT of a length n complex sequence
- *  using the radix 2 Cooley-Tukey algorithm.
- *  Bare bones implementation that runs in O(n log n) time and O(n)
- *  space. Our goal is to optimize the clarity of the code, rather
- *  than performance.
- *
- *  This implementation uses the primitive root of unity w = e^(-2 pi i / n).
- *  Some resources use w = e^(2 pi i / n).
- *
- *  Reference: https://www.cs.princeton.edu/~wayne/kleinberg-tardos/pdf/05DivideAndConquerII.pdf
- *
- *  Limitations
- *  -----------
- *   -  assumes n is a power of 2
- *
- *   -  not the most memory efficient algorithm (because it uses
- *      an object type for representing complex numbers and because
- *      it re-allocates memory for the subarray, instead of doing
- *      in-place or reusing a single temporary array)
- *
- *  For an in-place radix 2 Cooley-Tukey FFT, see
- *  https://introcs.cs.princeton.edu/java/97data/InplaceFFT.java.html
- *
- ******************************************************************************/
-
-public class FFT {
-
-    // compute the FFT of x[], assuming its length n is a power of 2
-    public static Complex[] fft(Complex[] x) {
-        int n = x.length;
-
-        // base case
-        if (n == 1) return new Complex[]{x[0]};
-
-        // radix 2 Cooley-Tukey FFT
-        if (n % 2 != 0) {
-            throw new IllegalArgumentException("n is not a power of 2");
-        }
-
-        // compute FFT of even terms
-        Complex[] even = new Complex[n / 2];
-        for (int k = 0; k < n / 2; k++) {
-            even[k] = x[2 * k];
-        }
-        Complex[] evenFFT = fft(even);
-
-        // compute FFT of odd terms
-        Complex[] odd = even;  // reuse the array (to avoid n log n space)
-        for (int k = 0; k < n / 2; k++) {
-            odd[k] = x[2 * k + 1];
-        }
-        Complex[] oddFFT = fft(odd);
-
-        // combine
-        Complex[] y = new Complex[n];
-        for (int k = 0; k < n / 2; k++) {
-            double kth = -2 * k * Math.PI / n;
-            Complex wk = new Complex(Math.cos(kth), Math.sin(kth));
-            y[k] = evenFFT[k].plus(wk.times(oddFFT[k]));
-            y[k + n / 2] = evenFFT[k].minus(wk.times(oddFFT[k]));
-        }
-        return y;
-    }
-
-
-    // compute the inverse FFT of x[], assuming its length n is a power of 2
-    public static Complex[] ifft(Complex[] x) {
-        int n = x.length;
-        Complex[] y = new Complex[n];
-
-        // take conjugate
-        for (int i = 0; i < n; i++) {
-            y[i] = x[i].conjugate();
-        }
-
-        // compute forward FFT
-        y = fft(y);
-
-        // take conjugate again
-        for (int i = 0; i < n; i++) {
-            y[i] = y[i].conjugate();
-        }
-
-        // divide by n
-        for (int i = 0; i < n; i++) {
-            y[i] = y[i].scale(1.0 / n);
-        }
-
-        return y;
-
-    }
-
-    // compute the circular convolution of x and y
-    public static Complex[] cconvolve(Complex[] x, Complex[] y) {
-
-        // should probably pad x and y with 0s so that they have same length
-        // and are powers of 2
-        if (x.length != y.length) {
-            throw new IllegalArgumentException("Dimensions don't agree");
-        }
-
-        int n = x.length;
-
-        // compute FFT of each sequence
-        Complex[] a = fft(x);
-        Complex[] b = fft(y);
-
-        // point-wise multiply
-        Complex[] c = new Complex[n];
-        for (int i = 0; i < n; i++) {
-            c[i] = a[i].times(b[i]);
-        }
-
-        // compute inverse FFT
-        return ifft(c);
-    }
-
-
-    // compute the linear convolution of x and y
-    public static Complex[] convolve(Complex[] x, Complex[] y) {
-        Complex ZERO = new Complex(0, 0);
-
-        Complex[] a = new Complex[2 * x.length];
-        for (int i = 0; i < x.length; i++) a[i] = x[i];
-        for (int i = x.length; i < 2 * x.length; i++) a[i] = ZERO;
-
-        Complex[] b = new Complex[2 * y.length];
-        for (int i = 0; i < y.length; i++) b[i] = y[i];
-        for (int i = y.length; i < 2 * y.length; i++) b[i] = ZERO;
-
-        return cconvolve(a, b);
-    }
-
-    // compute the DFT of x[] via brute force (n^2 time)
-    public static Complex[] dft(Complex[] x) {
-        int n = x.length;
-        Complex ZERO = new Complex(0, 0);
-        Complex[] y = new Complex[n];
-        for (int k = 0; k < n; k++) {
-            y[k] = ZERO;
-            for (int j = 0; j < n; j++) {
-                int power = (k * j) % n;
-                double kth = -2 * power * Math.PI / n;
-                Complex wkj = new Complex(Math.cos(kth), Math.sin(kth));
-                y[k] = y[k].plus(x[j].times(wkj));
-            }
-        }
-        return y;
-    }
-
-    // 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("-------------------");
-        for (int i = 0; i < x.length; i++) {
-            System.out.println(x[i]);
-        }
-        System.out.println();
-    }
-
-    /***************************************************************************
-     *  Test client and sample execution
-     *
-     *  % java FFT 4
-     *  x
-     *  -------------------
-     *  -0.03480425839330703
-     *  0.07910192950176387
-     *  0.7233322451735928
-     *  0.1659819820667019
-     *
-     *  y = fft(x)
-     *  -------------------
-     *  0.9336118983487516
-     *  -0.7581365035668999 + 0.08688005256493803i
-     *  0.44344407521182005
-     *  -0.7581365035668999 - 0.08688005256493803i
-     *
-     *  z = ifft(y)
-     *  -------------------
-     *  -0.03480425839330703
-     *  0.07910192950176387 + 2.6599344570851287E-18i
-     *  0.7233322451735928
-     *  0.1659819820667019 - 2.6599344570851287E-18i
-     *
-     *  c = cconvolve(x, x)
-     *  -------------------
-     *  0.5506798633981853
-     *  0.23461407150576394 - 4.033186818023279E-18i
-     *  -0.016542951108772352
-     *  0.10288019294318276 + 4.033186818023279E-18i
-     *
-     *  d = convolve(x, x)
-     *  -------------------
-     *  0.001211336402308083 - 3.122502256758253E-17i
-     *  -0.005506167987577068 - 5.058885073636224E-17i
-     *  -0.044092969479563274 + 2.1934338938072244E-18i
-     *  0.10288019294318276 - 3.6147323062478115E-17i
-     *  0.5494685269958772 + 3.122502256758253E-17i
-     *  0.240120239493341 + 4.655566391833896E-17i
-     *  0.02755001837079092 - 2.1934338938072244E-18i
-     *  4.01805098805014E-17i
-     *
-     ***************************************************************************/
-
-    public static void main(String[] args) {
-        int n = Integer.parseInt(args[0]);
-        Complex[] x = new Complex[n];
-
-        // original data
-        for (int i = 0; i < n; i++) {
-            x[i] = new Complex(i, 0);
-        }
-        show(x, "x");
-
-        // FFT of original data
-        Complex[] y = fft(x);
-        show(y, "y = fft(x)");
-
-        // FFT of original data
-        Complex[] y2 = dft(x);
-        show(y2, "y2 = dft(x)");
-
-        // take inverse FFT
-        Complex[] z = ifft(y);
-        show(z, "z = ifft(y)");
-
-        // circular convolution of x with itself
-        Complex[] c = cconvolve(x, x);
-        show(c, "c = cconvolve(x, x)");
-
-        // linear convolution of x with itself
-        Complex[] d = convolve(x, x);
-        show(d, "d = convolve(x, x)");
-    }
-}
-
-

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

@@ -42,6 +42,8 @@ import java.util.concurrent.ExecutionException;
 
 /**
  * Video Detector inherits some methods from abstract Detector class (more info there)
+ * USE FROM MAIN ACTIVITY:
+ * VideoDetector vd = new VideoDetector(this);
  * */
 
 
@@ -76,7 +78,7 @@ public class VideoDetector extends Detector {
     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 = 2000;   // milliseconds
+    private static final float START_DELAY = 20000;   // milliseconds
     private static final android.util.Size IMAGE_RES = new android.util.Size(640, 480);
 
 
@@ -134,7 +136,7 @@ public class VideoDetector extends Detector {
         if (isRecording){
             return;
         }
-        Toast.makeText(context, "Aufnahme gestartet", Toast.LENGTH_SHORT).show();
+
         videoCapture = setupVideoCapture();
 
         final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
@@ -155,12 +157,12 @@ public class VideoDetector extends Detector {
                             @Override
                             public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
                                 isRecording = false;
-                                Toast.makeText(context, "Aufnahme gespeichert", Toast.LENGTH_SHORT).show();
+                                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, "Aufnahme fehlgeschlagen", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(context, "video recording failed", Toast.LENGTH_SHORT).show();
                             }
                         }
                 );
@@ -173,9 +175,6 @@ public class VideoDetector extends Detector {
     public void stopDetection() {
         if (!isDetecting || imageAnalysis == null)
             return;
-        if (!isRecording)
-            cameraProvider.unbindAll();
-        else
         cameraProvider.unbind(imageAnalysis);
         isDetecting = false;
         allowReportViolation = false;
@@ -188,10 +187,6 @@ public class VideoDetector extends Detector {
             return;
 
         videoCapture.stopRecording();
-
-        if (!isDetecting())
-            cameraProvider.unbindAll();
-        else
         cameraProvider.unbind(videoCapture);
         isRecording = false;
     }
@@ -224,10 +219,10 @@ public class VideoDetector extends Detector {
 
                 int n = OpenCVHelper.countNonZeroPixels(processed);
                 int pixelCount = image.getWidth() * image.getHeight();
-                float percentChanged = ((float) n / pixelCount) * 100;
+                float percentChanged = (float) n / pixelCount;
 
                 // Violation Condition
-                if (percentChanged> ALARM_THRESHOLD) {
+                if (percentChanged * 100 > ALARM_THRESHOLD) {
                     if (allowReportViolation)
                         reportViolation("Video", percentChanged);
                 }
@@ -315,7 +310,7 @@ public class VideoDetector extends Detector {
 
     /** Start delay until Violation Report is allowed */
     private void startViolationTimer(float setupTime) {
-        new CountDownTimer((long) (setupTime), 100) {
+        new CountDownTimer((long) (START_DELAY), 100) {
             @Override
             public void onTick(long millisUntilFinished) {
             }

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

@@ -1,61 +0,0 @@
-package com.example.ueberwachungssystem.Fragments;
-
-import android.content.Context;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.VideoView;
-
-import androidx.fragment.app.Fragment;
-
-import com.example.ueberwachungssystem.R;
-
-import java.io.File;
-
-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.Alarm);
-        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;
-    }
-    public static Fragment1 aktualisieren(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/Fragment3.java

@@ -1,62 +0,0 @@
-package com.example.ueberwachungssystem.Fragments;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import androidx.fragment.app.Fragment;
-
-import com.example.ueberwachungssystem.R;
-
-public class Fragment3 extends Fragment {
-
-    private OnImageViewReadyListener onImageViewReadyListener;
-    private String text;
-    public static ImageView ivp;
-    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.fragment3, container, false);
-        if (onImageViewReadyListener != null) {
-            ImageView ivp = (ImageView) view.findViewById(R.id.Video);
-            ImageView ivp2 = (ImageView) view.findViewById(R.id.Video2);
-            onImageViewReadyListener.onImageViewReady(ivp, ivp2);
-        }
-        return view;
-    }
-    public static Fragment3 erstellen(View view) {
-        Fragment3 fragment = new Fragment3();
-        return fragment;
-    }
-    public interface OnImageViewReadyListener {
-        void onImageViewReady(ImageView imageView, ImageView imageView2);
-    }
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        try {
-            onImageViewReadyListener = (OnImageViewReadyListener) context;
-        } catch (ClassCastException e) {
-            throw new ClassCastException(context.toString() + " must implement OnImageViewReadyListener");
-        }
-    }
-    @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/VideoListFragment.java

@@ -1,104 +0,0 @@
-package com.example.ueberwachungssystem.Fragments;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.Toast;
-import android.widget.VideoView;
-
-import androidx.fragment.app.Fragment;
-
-import com.example.ueberwachungssystem.R;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-public class VideoListFragment extends Fragment {
-
-    private ListView listView;
-    private Button button;
-    private ArrayAdapter<String> adapter;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.videolist_fragment, container, false);
-
-
-        button = rootView.findViewById(R.id.button);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                File dir = getContext().getFilesDir();
-                File[] files = dir.listFiles();
-                for (File file: files) {
-                    file.delete();
-                }
-            }
-        });
-
-
-
-        listView = rootView.findViewById(R.id.listView);
-        adapter = new ArrayAdapter<>(requireContext(), android.R.layout.simple_list_item_1, getFileNames());
-        listView.setAdapter(adapter);
-
-        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                // Handle item click event here
-                String selectedItem = getContext().getFilesDir().toString() + "/" + adapter.getItem(position);
-                //Toast.makeText(requireContext(), selectedItem, Toast.LENGTH_SHORT).show();
-
-                openVideoPopup(selectedItem);
-            }
-        });
-        return rootView;
-    }
-
-    private List<String> getFileNames() {
-        // Add your data source here, e.g., an array or a list
-        File dir = getContext().getFilesDir();
-        File[] files = dir.listFiles();
-        Log.d("files", getContext().getFilesDir().toString());
-
-
-        List<String> fileNamesList = new ArrayList<>();
-        assert files != null;
-        for (File file : files) {
-            fileNamesList.add(file.getName());
-        }
-        return fileNamesList;
-    }
-
-
-    private void openVideoPopup(String videoPath) {
-        LayoutInflater inflater = LayoutInflater.from(requireContext());
-        View popupView = inflater.inflate(R.layout.videolist_popup, null);
-
-        VideoView videoView = popupView.findViewById(R.id.videoView);
-        videoView.setVideoPath(videoPath);
-        videoView.start();
-
-        PopupWindow popupWindow = new PopupWindow(popupView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, true);
-
-        popupView.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                //Close the window when clicked
-                popupWindow.dismiss();
-                return true;
-            }
-        });
-        popupWindow.showAtLocation(listView, Gravity.CENTER, 0, 0);
-    }
-}

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

@@ -1,233 +1,113 @@
 package com.example.ueberwachungssystem;
 
-import androidx.camera.core.ExperimentalGetImage;
+import static android.content.ContentValues.TAG;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 
 import android.annotation.SuppressLint;
-import android.content.ComponentName;
+import android.net.wifi.WifiInfo;
-import android.content.Context;
+import android.net.wifi.WifiManager;
-import android.content.Intent;
+import android.net.wifi.WifiInfo;
-import android.content.ServiceConnection;
+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.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.widget.ToggleButton;
 
-import com.example.ueberwachungssystem.Fragments.Fragment1;
+import androidx.appcompat.app.AppCompatActivity;
-import com.example.ueberwachungssystem.Detection.DetectorService;
+import java.net.InetAddress;
-import com.example.ueberwachungssystem.Fragments.Fragment3;
+import java.net.UnknownHostException;
-import com.example.ueberwachungssystem.Fragments.VideoListFragment;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 
-import java.util.OptionalInt;
+@SuppressLint("SetTextI18n")
+public class MainActivity extends AppCompatActivity {
 
-@ExperimentalGetImage
+    WifiCommunication communication;
-public class MainActivity extends AppCompatActivity implements Fragment3.OnImageViewReadyListener{
+    PermissionRequest permission;
-    //StringBuffer
+    boolean communicationRunning = true;
-    private StringBuffer messageBuffer = new StringBuffer();
+    String dataRecieved;
-
+    TextView textview1;
-    //Fragmente
-    private Fragment aktuellesFragment;
-    private Fragment fragment1_;
-    private Fragment fragment2_;
-    private Fragment fragment3_;
-
-    private Fragment1 fragment1;
-    private Fragment3 fragment3;
-
-    private ImageView fragmentImage;
-    private ImageView fragmentImage2;
-    private VideoListFragment videoListFragment = new VideoListFragment();
-    private DetectorService detectorService = new DetectorService();
-    int num = 0;
-    //Textviews
-    private TextView Auswahl;
-    private TextView AoderA;
-    private String auswahltext = "Wahl des Detektionsmodus";
-    private String auswahlAoderA = "Wahl von Alarmmeldungen oder Auswahl von Alarmaufzeichnungen";
-    //Buttons
-    private ToggleButton toggleKamera;
-    private ToggleButton toggleAudio;
-    private ToggleButton toggleBewegung;
 
         @Override
         protected void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-        setTitle("Supervision");
             setContentView(R.layout.activity_main);
-        Auswahl = findViewById(R.id.textAuswahl);
+            textview1 = findViewById(R.id.textView1);
-        Auswahl.setText(auswahltext);
-        AoderA = findViewById(R.id.textAoderA);
-        AoderA.setText(auswahlAoderA);
-        toggleKamera = findViewById(R.id.toggleKamera);
-        toggleAudio = findViewById(R.id.toggleAudio);
-        toggleBewegung = findViewById(R.id.toggleBewegung);
-    }
 
+            Button button1 = findViewById(R.id.buttonSend);
+            button1.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    communication.sendTrue("Testmessage");
+                }
+            });
+        }
     @Override
     protected void onResume() {
         super.onResume();
-
+        if (communicationRunning){
-        PermissionHandler permissionHandler = new PermissionHandler(this);
+            communication = new WifiCommunication(1234);
-        //permissionHandler.getPermissions();
+            communication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
-        if (permissionHandler.hasPermissions()) {
-
-            Intent serviceIntent = new Intent(this, DetectorService.class);
-            bindService(serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE);
-            startService(serviceIntent);
-
-            toggleKamera.setOnClickListener(new View.OnClickListener() {
                 @Override
-                public void onClick(View v) {
+                public void onConnection(StringBuffer data) {
-                    if (toggleKamera.isChecked()) {
+                    //Log.d("Test", data.toString());
-                        if(detectorService != null) {
+                    runOnUiThread(new Runnable() {
-                            detectorService.videoDetector.startDetection();
+                        @Override
-                        }
+                        public void run() {
-                    } else {
+                            textview1.setText(data);
-                        if(detectorService != null) {
-                            detectorService.videoDetector.stopDetection();
-                        }
-                    }
                         }
                     });
-            toggleAudio.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (toggleAudio.isChecked()) {
-                        if(detectorService != null) {
-                            detectorService.audioDetector.startDetection();
-                        }
-                    } else {
-                        if(detectorService != null) {
-                            detectorService.audioDetector.stopDetection();
-                        }
-                    }
                 }
             });
-            toggleBewegung.setOnClickListener(new View.OnClickListener() {
+            communicationRunning = false;
+        }
+        permission = new PermissionRequest(MainActivity.this);
+        permission.rechtePruefen();
+        }
+
     @Override
-                public void onClick(View v) {
+    protected void onPause() {
-                    if (toggleBewegung.isChecked()) {
+        super.onPause();
-                        if(detectorService != null) {
+        //communication.stopCommunication();
-                            detectorService.motionDetector.startDetection();
     }
-                    } else {
-                        if(detectorService != null) {
-                            detectorService.motionDetector.stopDetection();
-                        }
-                    }
-                }
-            });
-        }else{
-            Toast.makeText(this,"Bitte Rechte geben", Toast.LENGTH_SHORT).show();
-        }
-
-    }
-
     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(toggleAudio);
+                //popUpClass.showPopupWindow(tvMessages);
                 popUpClass.RechtePrüfen();
                 return true;
             case R.id.Sensoren:
                 popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(toggleAudio);
+                //popUpClass.showPopupWindow(tvMessages);
                 popUpClass.Sensoren();
                 return true;
             case R.id.Impressum:
                 popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(toggleAudio);
+                //popUpClass.showPopupWindow(tvMessages);
                 popUpClass.Impressum();
                 return true;
-            case R.id.Detection:
-                popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(toggleAudio);
-                popUpClass.DetectionTotal(num);
-                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
     }
-
+    private String getLocalIpAddress() throws UnknownHostException {
-    private ServiceConnection serviceConnection = new ServiceConnection() {
+        WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
-        @Override
+        assert wifiManager != null;
-        public void onServiceConnected(ComponentName name, IBinder service) {
+        WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-            DetectorService.ServiceBinder binder = (DetectorService.ServiceBinder) service;
+        int ipInt = wifiInfo.getIpAddress();
-            detectorService = binder.getBoundService();
+        return InetAddress.getByAddress(ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(ipInt).array()).getHostAddress();
-
-            detectorService.setOnDetectionListener(new DetectorService.OnDetectionListener() {
-                @Override
-                public void onDetection(@NonNull StringBuffer stringBuffer) {
-                    Log.d("onDetection", stringBuffer.toString()); //Für oli hier Textview einbauen
-                    num = stringBuffer.toString().split("\n").length;
-                    messageBuffer = stringBuffer;
-                    if ((aktuellesFragment == fragment1_) && (aktuellesFragment != null)) {
-                        Log.d("Fragment", aktuellesFragment.toString() + " " + fragment1_.toString());
-                        fragment1_ = zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
-                    }
-                }
-            });
-        }
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-        }
-    };
-
-    public void onClickZeigeFragment1(View view) {
-        Button button = (Button) view;
-        fragment1_ = zeigeFragment(fragment1.erstellen(messageBuffer.toString()));
-    }
-
-    public void onClickZeigeFragment2(View view) {
-        Button button = (Button) view;
-        //zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos"));
-        fragment2_ = zeigeFragment(videoListFragment);
-    }
-    public void onClickZeigeFragment3(View view) {
-        Button button = (Button) view;
-        fragment3_ = zeigeFragment(fragment3.erstellen(view));
-    }
-    public void onImageViewReady(ImageView imageView, ImageView imageView2) {
-        fragmentImage = imageView;
-        fragmentImage2 = imageView2;
-        detectorService.videoDetector.debugProcessing(fragmentImage, fragmentImage2); //inputImageView
-    }
-
-    public void onClickEntferneFragment(View view) {
-        entferneFragment();
-    }
-
-    private Fragment zeigeFragment(Fragment fragment) {
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.replace(R.id.frame, fragment);
-        ft.commit();
-        aktuellesFragment = fragment;
-        return aktuellesFragment;
-    }
-    private void entferneFragment() {
-        if (aktuellesFragment != null) {
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.remove(aktuellesFragment);
-            ft.commit();
-            aktuellesFragment = null ;
-        }
     }
 }
+

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

@@ -35,7 +35,7 @@ public class PermissionRequest extends AppCompatActivity{
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    Toast.makeText(mainActivity.getApplicationContext(),"Es werden Rechte benötigt", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(mainActivity.getApplicationContext(),"Es werden Rechte benötigt", Toast.LENGTH_LONG).show();
                 }
             });
         }

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

@@ -15,8 +15,6 @@ public class PopUpClass {
     PermissionRequest permission;
     TextView PopUpText;
 
-    Button buttonEdit;
-
 
     public PopUpClass(MainActivity mainActivity) {
         this.mainActivity = mainActivity;
@@ -49,7 +47,7 @@ public class PopUpClass {
 
         PopUpText = popupView.findViewById(R.id.titleText);
 
-        buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
+        Button buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
         buttonEdit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -72,25 +70,17 @@ public class PopUpClass {
     public void RechtePrüfen(){
         StringBuilder Text = permission.rechtePruefen();
         PopUpText.setText(Text);
-        buttonEdit.setVisibility(View.VISIBLE);
-
     }
     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\n Diese können sowohl einzeln als auch alle zusammen verwendet werden");
+        PopUpText.setText("Es können 3 verschiedene Sensoren verwendet werden \n -1. Beschleunigungssensor\n -2. Mikrofon\n -3. Kamera");
-        buttonEdit.setVisibility(View.GONE);
     }
     public void Impressum(){
-        PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert \n Von: \n -Kohler Bastian\n -Kleinecke Oliver\n -Market Leon\n -Siebenhaar Miguel\n -Wolz Tobias ");
+        PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert");
-        buttonEdit.setVisibility(View.GONE);
-    }
-    public void DetectionTotal(int num) {
-        PopUpText.setText("Total Detektions:" +num);
-        buttonEdit.setVisibility(View.GONE);
     }
+
 }

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

@@ -1,6 +1,5 @@
 package com.example.ueberwachungssystem;
 import android.annotation.SuppressLint;
-import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -31,11 +30,6 @@ public class WifiCommunication {
     private final DatagramSocket socket;
     volatile private boolean running;
 
-    private boolean Gruppe =true;
-    private boolean showMessage = true;
-
-    StringBuffer rxStringBuffer = new StringBuffer();
-
     private OnConnectionListener listener;
     @SuppressLint("SetTextI18n")
     public WifiCommunication(int port) {
@@ -57,20 +51,20 @@ public class WifiCommunication {
     }
 
     public interface OnConnectionListener {
-        void onConnection(String data);
+        void onConnection(StringBuffer data);
     }
     public void setOnConnectionListener(@NonNull OnConnectionListener listener) {
         this.listener = listener;
     }
 
-    public void sendWifiData(String wifiMessage) {
+    public void sendWifiData(StringBuffer wifiMessage) {
         if (listener != null) {
             listener.onConnection(wifiMessage);
-
         }
     }
 
     private class ReceiveThread extends Thread {
+        private StringBuffer rxStringBuffer = new StringBuffer();
         private String rxString="";
         private String previousRxString = "";
 
@@ -83,31 +77,12 @@ public class WifiCommunication {
                     socket.receive(rxPacket);
                     rxString = new String(receiveData, 0, rxPacket.getLength());
                     String[] splitrxString = rxString.split(",");
-                    String[] splitrxStringBuffer = splitBufferIntoStrings(rxStringBuffer);
+                    if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7) {
-                    for(String elem: splitrxStringBuffer){
-                        if(elem.equals(rxString)){
-                            showMessage = false;
-                        }else{
-                            showMessage = true;
-                        }
-                    }
-                    if(Gruppe){
-                        if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7 && showMessage) {
                         rxStringBuffer.append(rxString).append("\n");
-                            Log.d("empfangen", rxString);
+                        sendWifiData(rxStringBuffer);
-                            sendWifiData(rxString);
                         //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
                         previousRxString = rxString;
                     }
-                    }else{
-                        if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7 && showMessage) {
-                            rxStringBuffer.append(rxString).append("\n");
-                            Log.d("empfangen", rxString);
-                            sendWifiData(rxString);
-                            //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
-                            previousRxString = rxString;
-                        }
-                    }
                 } while (running);
             }
             catch (IOException e) {
@@ -124,17 +99,16 @@ public class WifiCommunication {
                     if(send)
                     {
                         send = false;
-                        /*SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
+                        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
                         Date curDate = new Date(System.currentTimeMillis());
-                        String str = formatter.format(curDate);*/
+                        String str = formatter.format(curDate);
                         byte[] send_Data = new byte[512];
-                        String txString = (messageToSend); //"1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video,"
+                        String txString = ("1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video," +messageToSend);
-                        Log.d("send", txString);
                         send_Data = txString.getBytes();
 
                         DatagramPacket txPacket = new DatagramPacket(send_Data, txString.length(), address, port);
 
-                        for(int i = 0; i < 500; i++) {
+                        for(int i = 0; i < 300; i++) {
                             socket.send(txPacket);
                         }
                     }
@@ -169,8 +143,4 @@ public class WifiCommunication {
         running = false;
         socket.close();
     }
-    public String[] splitBufferIntoStrings(StringBuffer string){
-        String[] splitrxString2 = string.toString().split("\n");
-        return splitrxString2;
-    }
 }

app/src/main/res/drawable/toggle_btn.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="false" android:drawable="@color/redbright"  />
-    <item android:state_checked="true" android:drawable="@color/greenbright"  />
-</selector>

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

@@ -1,133 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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:background="#010C49"
+    android:layout_gravity="center"
-    android:visibility="visible"
+    android:gravity="top"
-    tools:context="com.example.ueberwachungssystem.MainActivity"
+    android:orientation="vertical"
-    tools:visibility="visible">
+    tools:context=".MainActivity">
 
-    <TextView
+
-        android:id="@+id/textAuswahl"
+    <androidx.camera.view.PreviewView
+        android:id="@+id/previewView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
+        android:backgroundTint="@android:color/black"/>
-        android:layout_alignParentLeft="true"
-        android:textSize="20sp"
-        android:textColor="@color/white"/>
-
-    <TextView
-        android:id="@+id/textAoderA"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/toggleAudio"
-        android:layout_alignParentLeft="true"
-        android:layout_marginTop="15dp"
-        android:textSize="20sp"
-        android:textColor="@color/white"/>
 
     <ToggleButton
-        android:id="@+id/toggleKamera"
+        android:id="@+id/toggleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/toggleAudio"
-        android:layout_marginRight="30dp"
-        android:layout_toLeftOf="@id/toggleAudio"
-        android:textColor="@color/yellow"
-        android:textOn="Kamera an"
-        android:textOff="Kamera aus"
-        android:background="@drawable/toggle_btn"/>
-
-    <ToggleButton
-        android:id="@+id/toggleAudio"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/textAuswahl"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="5dp"
-        android:textColor="@color/yellow"
-        android:textOn="Audio an"
-        android:textOff="Audio aus"
-        android:background="@drawable/toggle_btn"/>
-
-    <ToggleButton
-        android:id="@+id/toggleBewegung"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/toggleAudio"
-        android:layout_marginLeft="30dp"
-        android:layout_toEndOf="@+id/toggleAudio"
-        android:layout_toRightOf="@id/toggleAudio"
-        android:textColor="@color/yellow"
-        android:textOn="Bewegung an"
-        android:textOff="Bewegung aus"
-        android:background="@drawable/toggle_btn"/>
-
-    <Button
-        android:id="@+id/btnAlarme"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/btnAufnahmen"
-        android:layout_toLeftOf="@id/btnAufnahmen"
-        android:layout_marginRight="15dp"
-        android:theme="@style/Button.Green"
-        android:onClick="onClickZeigeFragment1"
-        android:text="Alarme" />
-
-    <Button
-        android:id="@+id/btnAufnahmen"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/textAoderA"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="15dp"
-        android:theme="@style/Button.Green"
-        android:onClick="onClickZeigeFragment2"
-        android:text="Aufnahmen" />
-
-    <Button
-        android:id="@+id/btnAnzeigeVerb"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/btnAufnahmen"
-        android:layout_toRightOf="@id/btnAufnahmen"
-        android:layout_marginLeft="15dp"
-        android:text="Live Video"
-        android:onClick="onClickZeigeFragment3"/>
-
-    <FrameLayout
-        android:id="@+id/frame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
-        android:layout_below="@+id/btnAufnahmen"
+        android:text="ToggleButton" />
-        android:layout_marginTop="25dp"
+
-        android:layout_alignParentStart="true"
+    <ImageView
-        android:background="@color/white">
+        android:id="@+id/inputImageView"
-    </FrameLayout>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:srcCompat="@tools:sample/avatars" />
+
+    <ImageView
+        android:id="@+id/outputImageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:srcCompat="@tools:sample/avatars" />
+
+    <androidx.camera.view.PreviewView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
-    <!--
-    <ScrollView
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/btnAufnahmen"
-        android:layout_marginTop="25dp">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
     <TextView
-                android:id="@+id/Alarm"
+        android:id="@+id/textView1"
-                android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-                android:background="@color/red"/>
+        android:text="TextView" />
-        </LinearLayout>
-    </ScrollView>
-    -->
-    <ListView
-        android:id = "@+id/listView"
-        android:layout_width = "wrap_content"
-        android:layout_height = "wrap_content"/>
 
-</RelativeLayout>
+    <Button
+        android:id="@+id/buttonSend"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Button" />
+
+</LinearLayout>

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

@@ -1,26 +0,0 @@
-<?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="@color/bluedark">
-
-    <ScrollView
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="25dp">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-            <TextView
-                android:id="@+id/Alarm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/yellow"/>
-        </LinearLayout>
-    </ScrollView>
-
-</RelativeLayout>

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

@@ -1,33 +0,0 @@
-<?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" >
-
-    <ScrollView
-        android:id="@+id/scrollView2"
-        android:layout_width="match_parent"
-        android:layout_height="250dp"
-        android:layout_marginTop="25dp">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-            <TextView
-                android:id="@+id/Aufzeichnungen"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/yellow"/>
-        </LinearLayout>
-    </ScrollView>
-
-    <VideoView
-        android:id="@+id/AusAuf"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/scrollView2"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-</LinearLayout>

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

@@ -1,24 +0,0 @@
-<?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="@color/bluedark">
-
-    <ImageView
-        android:id="@+id/Video"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:rotation="90">
-    </ImageView>
-    <ImageView
-        android:id="@+id/Video2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:rotation="90">
-    </ImageView>
-
-</LinearLayout>

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

@@ -6,7 +6,7 @@
     android:paddingLeft="10dp"
     android:paddingRight="10dp"
     android:gravity="center"
-    android:background="#010C49">
+    android:background="#A5ACB2">
 
     <TextView
         android:id="@+id/titleText"
@@ -15,7 +15,6 @@
         android:layout_height="wrap_content"
         android:textSize="20sp"
         android:textStyle="italic"
-        android:textColor="@color/white"
         android:padding="10dp"/>
 
     <Button
@@ -23,7 +22,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:backgroundTint="@color/purple_500"
         android:text="Rechte Anfordern" />
 
 

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat 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:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:background="@android:color/holo_blue_light">
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Aufnahmen Löschen"
-        android:backgroundTint="#010C49"
-        tools:ignore="MissingConstraints" />
-
-    <ListView
-        android:id="@+id/listView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="0dp" />
-
-
-</androidx.appcompat.widget.LinearLayoutCompat>

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <VideoView
-        android:id="@+id/videoView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"/>
-
-</FrameLayout>

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

@@ -4,8 +4,6 @@
         android:title="Rechteverwaltung" />
     <item android:id="@+id/Sensoren"
         android:title="Sensoren" />
-    <item android:id="@+id/Detection"
-        android:title="Detektionen" />
     <item android:id="@+id/Impressum"
         android:title="Impressum" />
 </menu>

app/src/main/res/values/colors.xml

@@ -7,9 +7,4 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="red">#5C0000</color>
-    <color name="redbright">#EF3434</color>
-    <color name="greenbright">#469733</color>
-    <color name="bluedark">#053C8E</color>
-    <color name="yellow">#FFEB3B</color>
 </resources>

app/src/main/res/values/themes.xml

@@ -13,9 +13,4 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
-
-    <style name="Button.Green" parent="ThemeOverlay.AppCompat">
-        <item name="colorAccent">#0F3E01</item>
-    </style>
-
 </resources>

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 '8.0.0' apply false
+    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '8.0.0' apply false
+    id 'com.android.library' version '7.4.2' apply false
 }

gradle.properties

@@ -19,5 +19,3 @@ 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.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

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