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/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/DetectionReport.java

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

@@ -22,14 +22,16 @@ public class DetectorService extends LifecycleService {
     private DetectorService.OnDetectionListener listener;
     private boolean isServiceRunning = false;
 
-    VideoDetector videoDetector = null;
+    // Used Objects:
-    AudioRecorder audioRecorder = null;
+    public VideoDetector videoDetector = null;
-
+    public AudioRecorder audioRecorder = null;
-    /** Communication **/
+    public Accelerometer motionDetector = null;
+    public MicrophoneDetector audioDetector = null;
 
     WifiCommunication wifiCommunication;
 
-    StringBuffer dataFromWifi;
+    String dataFromWifi;
+    StringBuffer stringBufferFromWifi;
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
@@ -37,30 +39,61 @@ public class DetectorService extends LifecycleService {
             return START_NOT_STICKY;
 
 
-        // Setup Service classes:
+        /** 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);
+                //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;
 
-        wifiCommunication = new WifiCommunication (1234);
+        isServiceRunning = true;
-        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();
@@ -82,93 +115,26 @@ public class DetectorService extends LifecycleService {
     }
 
 
-    /** Video Detection */
+    /** Pass Detection Report to Service Detection Listener and trigger it */
-    public void startVideoDetection() {
+    public void passToServiceListener(StringBuffer stringBuffer) {
-        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(detectionReport);
+            listener.onDetection(stringBuffer);
         }
     }
 
 
     /** On Detection Listener - runs when violation is reported */
     public interface OnDetectionListener {
-        void onDetection(@NonNull DetectionReport detectionReport);
+        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

@@ -0,0 +1,365 @@
+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 = 20000;
+        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

@@ -0,0 +1,148 @@
+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

@@ -0,0 +1,246 @@
+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,8 +42,6 @@ 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);
  * */
 
 
@@ -175,7 +173,10 @@ public class VideoDetector extends Detector {
     public void stopDetection() {
         if (!isDetecting || imageAnalysis == null)
             return;
-        cameraProvider.unbind(imageAnalysis);
+        if (!isRecording)
+            cameraProvider.unbindAll();
+        else
+            cameraProvider.unbind(imageAnalysis);
         isDetecting = false;
         allowReportViolation = false;
     }
@@ -187,7 +188,11 @@ public class VideoDetector extends Detector {
             return;
 
         videoCapture.stopRecording();
-        cameraProvider.unbind(videoCapture);
+
+        if (!isDetecting())
+            cameraProvider.unbindAll();
+        else
+            cameraProvider.unbind(videoCapture);
         isRecording = false;
     }
 
@@ -219,10 +224,10 @@ public class VideoDetector extends Detector {
 
                 int n = OpenCVHelper.countNonZeroPixels(processed);
                 int pixelCount = image.getWidth() * image.getHeight();
-                float percentChanged = (float) n / pixelCount;
+                float percentChanged = ((float) n / pixelCount) * 100;
 
                 // Violation Condition
-                if (percentChanged * 100 > ALARM_THRESHOLD) {
+                if (percentChanged> ALARM_THRESHOLD) {
                     if (allowReportViolation)
                         reportViolation("Video", percentChanged);
                 }
@@ -310,7 +315,7 @@ public class VideoDetector extends Detector {
 
     /** Start delay until Violation Report is allowed */
     private void startViolationTimer(float setupTime) {
-        new CountDownTimer((long) (START_DELAY), 100) {
+        new CountDownTimer((long) (setupTime), 100) {
             @Override
             public void onTick(long millisUntilFinished) {
             }

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

@@ -3,11 +3,16 @@ 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;
@@ -17,44 +22,90 @@ 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 com.example.ueberwachungssystem.Detection.DetectionReport;
+import com.example.ueberwachungssystem.Detection.DetectorService;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-@SuppressLint("SetTextI18n")
+@ExperimentalGetImage
 public class MainActivity extends AppCompatActivity {
 
-    WifiCommunication communication;
+    //WifiCommunication communication;
     PermissionRequest permission;
     boolean communicationRunning = true;
-    String dataRecieved;
     TextView textview1;
 
+    private DetectorService detectorService = new DetectorService();
+
         @Override
         protected void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             setContentView(R.layout.activity_main);
-            textview1 = findViewById(R.id.textView1);
 
-            Button button1 = findViewById(R.id.buttonSend);
+            Intent serviceIntent = new Intent(this, DetectorService.class);
+            bindService(serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE);
+            startService(serviceIntent);
+            ToggleButton button1 = findViewById(R.id.toggleButton);
             button1.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if(button1.isChecked()){
+                        if(detectorService != null){
+                            detectorService.videoDetector.startDetection();
+                        }
+                    }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){
+        /*if (communicationRunning){
             communication = new WifiCommunication(1234);
             communication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
                 @Override
-                public void onConnection(StringBuffer data) {
+                public void onConnection(String data) {
                     //Log.d("Test", data.toString());
                     runOnUiThread(new Runnable() {
                         @Override
@@ -65,7 +116,7 @@ public class MainActivity extends AppCompatActivity {
                 }
             });
             communicationRunning = false;
-        }
+        }*/
         permission = new PermissionRequest(MainActivity.this);
         permission.rechtePruefen();
         }
@@ -79,35 +130,29 @@ public class MainActivity extends AppCompatActivity {
         getMenuInflater().inflate(R.menu.options_menu, menu);
         return true;
     }
-    public boolean onOptionsItemSelected(MenuItem item) {
+    /*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(tvMessages);
+                popUpClass.showPopupWindow(textview1);
                 popUpClass.RechtePrüfen();
                 return true;
             case R.id.Sensoren:
                 popUpClass = new PopUpClass(MainActivity.this);
-                //popUpClass.showPopupWindow(tvMessages);
+                popUpClass.showPopupWindow(textview1);
                 popUpClass.Sensoren();
                 return true;
             case R.id.Impressum:
                 popUpClass = new PopUpClass(MainActivity.this);
-                //popUpClass.showPopupWindow(tvMessages);
+                popUpClass.showPopupWindow(textview1);
                 popUpClass.Impressum();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
-    }
+    }*/
-    private String getLocalIpAddress() throws UnknownHostException {
+
-        WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
-        assert wifiManager != null;
-        WifiInfo wifiInfo = wifiManager.getConnectionInfo();
-        int ipInt = wifiInfo.getIpAddress();
-        return InetAddress.getByAddress(ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(ipInt).array()).getHostAddress();
-    }
 }
 

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

@@ -50,8 +50,7 @@ public class PopUpClass {
         Button buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
         buttonEdit.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onClick(View v) {RechteAnfordern();
-                RechteAnfordern();
             }
         });
 

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

@@ -1,5 +1,6 @@
 package com.example.ueberwachungssystem;
 import android.annotation.SuppressLint;
+import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -51,13 +52,13 @@ public class WifiCommunication {
     }
 
     public interface OnConnectionListener {
-        void onConnection(StringBuffer data);
+        void onConnection(String data);
     }
     public void setOnConnectionListener(@NonNull OnConnectionListener listener) {
         this.listener = listener;
     }
 
-    public void sendWifiData(StringBuffer wifiMessage) {
+    public void sendWifiData(String wifiMessage) {
         if (listener != null) {
             listener.onConnection(wifiMessage);
         }
@@ -77,9 +78,11 @@ public class WifiCommunication {
                     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");
+                        //rxStringBuffer.append(rxString).append("\n");
-                        sendWifiData(rxStringBuffer);
+                        sendWifiData(rxString);
+
                         //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
                         previousRxString = rxString;
                     }
@@ -99,17 +102,15 @@ public class WifiCommunication {
                     if(send)
                     {
                         send = false;
-                        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
-                        Date curDate = new Date(System.currentTimeMillis());
-                        String str = formatter.format(curDate);
                         byte[] send_Data = new byte[512];
-                        String txString = ("1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video," +messageToSend);
+                        String txString = (messageToSend);
                         send_Data = txString.getBytes();
 
                         DatagramPacket txPacket = new DatagramPacket(send_Data, txString.length(), address, port);
 
-                        for(int i = 0; i < 300; i++) {
+                        for(int i = 0; i < 500; i++) {
                             socket.send(txPacket);
+                            Log.d("senden", txPacket.getData().toString());
                         }
                     }
                 } while (running);

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

@@ -38,16 +38,4 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="TextView" />
-
-    <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

@@ -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>

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,3 +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.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