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

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,40 +22,66 @@ 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;
-    Accelerometer accelerometer = null;
+    public AudioRecorder audioRecorder = null;
-    MicrophoneDetector microphoneDetector = null;
+    public Accelerometer motionDetector = null;
+    public MicrophoneDetector audioDetector = null;
 
+    WifiCommunication wifiCommunication;
+
+    String dataFromWifi;
+    StringBuffer stringBufferFromWifi;
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (isServiceRunning)
             return START_NOT_STICKY;
 
+
+        /** Wifi Instanz Starten und Listener **/
+        wifiCommunication = new WifiCommunication (1234);
+        wifiCommunication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
+            @Override
+            public void onConnection(String data) {
+                dataFromWifi = data;
+                stringToStringbuffer(data);
+            }
+
+        });
+
+
+
         /** Video Detection/Recorder **/
         videoDetector = new VideoDetector(this);
         videoDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                passToServiceListener(detectionReport);
+                //passToServiceListener(detectionReport);
+                Log.d("Video", detectionReport.toMessage());
+                wifiCommunication.sendTrue(detectionReport.toMessage());
+
             }
         });
         /** Motion Detection**/
-        accelerometer = new Accelerometer(this);
+        motionDetector = new Accelerometer(this);
-        accelerometer.getSensor();
+        motionDetector.getSensor();
-        accelerometer.setOnDetectionListener(new Detector.OnDetectionListener() {
+        motionDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                passToServiceListener(detectionReport);
+                //passToServiceListener(detectionReport);
+                Log.d("Motion", detectionReport.toMessage());
+                wifiCommunication.sendTrue(detectionReport.toMessage());
             }
         });
         /** Audio Detection **/
-        microphoneDetector = new MicrophoneDetector(this);
+        audioDetector = new MicrophoneDetector(this);
-        microphoneDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
+        audioDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                passToServiceListener(detectionReport);
+                //passToServiceListener(detectionReport);
+                Log.d("Audio", detectionReport.toMessage());
+                wifiCommunication.sendTrue(detectionReport.toMessage());
             }
         });
         /** Audio Recorder**/
@@ -63,9 +89,11 @@ public class DetectorService extends LifecycleService {
 
 
 
+
         isServiceRunning = true;
         return super.onStartCommand(intent, flags, startId);
     }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -87,97 +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() {
-        if(microphoneDetector != null)
-            microphoneDetector.startDetection();
-    }
-    public void stopAudioDetection() {
-        if(microphoneDetector != null)
-            microphoneDetector.stopDetection();
-    }
-
-    /** Motion Detection */
-    public void startMotionDetection() {
-        if(accelerometer != null)
-            accelerometer.startDetection();
-    }
-    public void stopMotionDetection() {
-        if(accelerometer != null)
-            accelerometer.stopDetection();
-    }
-
-    /** 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

@@ -2,24 +2,16 @@ package com.example.ueberwachungssystem.Detection;
 
 import static java.lang.Math.*;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaRecorder;
 import android.os.AsyncTask;
 import android.util.Log;
 
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
 import com.example.ueberwachungssystem.Detection.Signalverarbeitung.Complex;
 import com.example.ueberwachungssystem.Detection.Signalverarbeitung.FFT;
-import com.example.ueberwachungssystem.Detection.DetectionReport;
-import com.example.ueberwachungssystem.Detection.Detector;
 
 public class MicrophoneDetector extends Detector {
     /**
@@ -28,11 +20,9 @@ public class MicrophoneDetector extends Detector {
      * @param context
      */
 
-    private static final int RECHTEANFORDERUNG_MIKROFON = 1;
-
     private AufnahmeTask aufnahmeTask;
     public boolean armed = false;
-    public int Schwellwert_Alarm = 100;
+    public int schwellwertAlarm = 100;
     private Context context;
 
     public MicrophoneDetector(Context context) {
@@ -58,12 +48,17 @@ public class MicrophoneDetector extends Detector {
         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);
@@ -112,8 +107,6 @@ public class MicrophoneDetector extends Detector {
 
             Log.d("0","Konfiguration: "+ s);
 
-            int pufferGroesseInAnzahlAbtastwerten = pufferGroesseInBytes / anzahlBytesProAbtastwert;
-
         }
 
         @Override
@@ -129,7 +122,7 @@ public class MicrophoneDetector extends Detector {
 
             //Kalibrierung
             try {
-                Thread.sleep(3000); // Time to lay down the phone
+                Thread.sleep(startDelay); // Time to lay down the phone
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
@@ -139,7 +132,7 @@ public class MicrophoneDetector extends Detector {
                 Verarbeitungsergebnis kalibrierErgebnis = verarbeiten(puffer, n);
                 kalibierWert += kalibrierErgebnis.maxAmp;
                 try {
-                    Thread.sleep(50);
+                    Thread.sleep(threadSleeptime);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
@@ -193,7 +186,7 @@ public class MicrophoneDetector extends Detector {
                     publishProgress(ergebnis);
 
                     try {
-                        Thread.sleep(10);
+                        Thread.sleep(threadSleeptime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
@@ -221,7 +214,7 @@ public class MicrophoneDetector extends Detector {
 
                 ringPuffer.hinzufuegen(max);
                 maxAmp = ringPuffer.maximum();
-                if (maxAmp <= Schwellwert_Alarm+kalibierWert) {
+                if (maxAmp <= schwellwertAlarm + kalibierWert) {
                     armed = true;
                 }
             }
@@ -234,10 +227,10 @@ public class MicrophoneDetector extends Detector {
             super.onProgressUpdate(progress);
             float maxAmpPrint = round(20*log10(abs(progress[0].maxAmp/1.0)));
             float kalibierWertPrint = round(20*log10(abs(kalibierWert)));
-            Log.d("0","VR, Max, Kal:" + progress[0].verarbeitungsrate + ", " + maxAmpPrint
+            Log.d("alarmAudio","VR: " + progress[0].verarbeitungsrate + ", Amp: " + maxAmpPrint
-            + " dB, " + kalibierWertPrint + " dB");
+            + " dB, Kal: " + kalibierWertPrint + " dB");
 
-            if (progress[0].maxAmp >= Schwellwert_Alarm+kalibierWert && armed == true) {
+            if (progress[0].maxAmp >= schwellwertAlarm + kalibierWert && armed == true) {
                 armed = false;
                 detectionReport = new DetectionReport(true, "Audio", maxAmpPrint);
                 reportViolation("Audio", maxAmpPrint);
@@ -359,16 +352,6 @@ public class MicrophoneDetector extends Detector {
             this.wichtungAlterWert = 1 - this.wichtungNeuerWert;
         }
 
-        float MittelwertPuffer(short[] puffer) {
-
-            for (int i = 0; i < puffer.length; i++) {
-                mittelwert = Math.abs(puffer[i]);
-            }
-            mittelwert = mittelwert/puffer.length;
-
-            return mittelwert;
-        }
-
         float mittel(float wert) {
             if (istMittelwertGesetzt) {
                 mittelwert = wert * wichtungNeuerWert + mittelwert * wichtungAlterWert;

app/src/main/java/com/example/ueberwachungssystem/Detection/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,12 +224,12 @@ 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 * 100);
+                        reportViolation("Video", percentChanged);
                 }
             }
             imageProxy.close();
@@ -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/MainActivity.java

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

app/src/main/java/com/example/ueberwachungssystem/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);