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/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;
@@ -27,48 +28,39 @@ public class DetectorService extends LifecycleService {
     public Accelerometer motionDetector = null;
     public MicrophoneDetector audioDetector = null;
 
-    public WifiCommunication wifiCommunication;
-
-    String wifiData;
-    StringBuffer stringBufferWifi = new StringBuffer();
-
-    String typOfAlarm;
+    WifiCommunication wifiCommunication;
 
+    String dataFromWifi;
+    StringBuffer stringBufferFromWifi;
 
     @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");
 
+        /** Wifi Instanz Starten und Listener **/
+        wifiCommunication = new WifiCommunication (1234);
         wifiCommunication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
             @Override
             public void onConnection(String data) {
-                Log.d("Listener", data);
-                wifiData = data;
+                dataFromWifi = 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);
+                Log.d("Video", detectionReport.toMessage());
                 wifiCommunication.sendTrue(detectionReport.toMessage());
+
             }
         });
         /** Motion Detection**/
@@ -78,6 +70,7 @@ public class DetectorService extends LifecycleService {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
                 //passToServiceListener(detectionReport);
+                Log.d("Motion", detectionReport.toMessage());
                 wifiCommunication.sendTrue(detectionReport.toMessage());
             }
         });
@@ -87,6 +80,7 @@ public class DetectorService extends LifecycleService {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
                 //passToServiceListener(detectionReport);
+                Log.d("Audio", detectionReport.toMessage());
                 wifiCommunication.sendTrue(detectionReport.toMessage());
             }
         });
@@ -96,8 +90,6 @@ public class DetectorService extends LifecycleService {
 
 
 
-
-
         isServiceRunning = true;
         return super.onStartCommand(intent, flags, startId);
     }
@@ -139,29 +131,10 @@ public class DetectorService extends LifecycleService {
         this.listener = listener;
     }
 
-    public void stringToStringbuffer(String string){
-        if(string != null) {
-            stringBufferWifi.insert(0,string + "\n");
-        }
-    }
+    /** string to stringbuffer **/
+    public void stringToStringbuffer(String dataString){
+        stringBufferFromWifi.append(dataString).append("\n");
+        passToServiceListener(stringBufferFromWifi);
 
-    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

@@ -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
-            + " dB, " + kalibierWertPrint + " dB");
+            Log.d("alarmAudio","VR: " + progress[0].verarbeitungsrate + ", Amp: " + maxAmpPrint
+            + " 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/MainActivity.java

@@ -1,151 +1,158 @@
 package com.example.ueberwachungssystem;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.camera.core.ExperimentalGetImage;
-import androidx.camera.view.PreviewView;
+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.ImageView;
+import android.widget.Button;
+import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
-import com.example.ueberwachungssystem.Detection.Accelerometer;
-import com.example.ueberwachungssystem.Detection.AudioRecorder;
+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.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 {
 
+    //WifiCommunication communication;
+    PermissionRequest permission;
+    boolean communicationRunning = true;
+    TextView textview1;
+
     private DetectorService detectorService = new DetectorService();
-    ImageView inputImageView;
-    ImageView outputImageView;
-    ToggleButton toggleButton;
-    int num=0;
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        inputImageView = findViewById(R.id.inputImageView);
-        outputImageView = findViewById(R.id.outputImageView);
-        toggleButton = findViewById(R.id.toggleButton);
-
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        PermissionHandler permissionHandler = new PermissionHandler(this);
-        //permissionHandler.getPermissions();
-        if (permissionHandler.hasPermissions()) {
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            setContentView(R.layout.activity_main);
 
             Intent serviceIntent = new Intent(this, DetectorService.class);
             bindService(serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE);
             startService(serviceIntent);
-
-            toggleButton.setOnClickListener(new View.OnClickListener() {
+            ToggleButton button1 = findViewById(R.id.toggleButton);
+            button1.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if (toggleButton.isChecked())
-                    {
-                        if (detectorService != null){
-
+                    if(button1.isChecked()){
+                        if(detectorService != null){
                             detectorService.videoDetector.startDetection();
-
-                            detectorService.audioDetector.startDetection();
-
-                            detectorService.motionDetector.startDetection();
-
-                            detectorService.audioRecorder.stopRecording();
-
-                            detectorService.videoDetector.startRecording();
                         }
-                    }
-                    else {
+                    }else{
                         detectorService.videoDetector.stopDetection();
-
-                        detectorService.audioDetector.stopDetection();
-
-                        detectorService.motionDetector.stopDetection();
-
-                        detectorService.audioRecorder.stopRecording();
-
-                        detectorService.videoDetector.stopRecording();
                     }
                 }
             });
-        }else{
-            Toast.makeText(this,"Bitte Rechte geben", Toast.LENGTH_SHORT).show();
+            //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) {
+    /*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(inputImageView);
+                popUpClass.showPopupWindow(textview1);
                 popUpClass.RechtePrüfen();
                 return true;
             case R.id.Sensoren:
                 popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(inputImageView);
+                popUpClass.showPopupWindow(textview1);
                 popUpClass.Sensoren();
                 return true;
             case R.id.Impressum:
                 popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(inputImageView);
+                popUpClass.showPopupWindow(textview1);
                 popUpClass.Impressum();
                 return true;
-            case R.id.Detection:
-                popUpClass = new PopUpClass(MainActivity.this);
-                popUpClass.showPopupWindow(inputImageView);
-                popUpClass.DetectionTotal(num);
-                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
-    }
+    }*/
 
-    private ServiceConnection serviceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            DetectorService.ServiceBinder binder = (DetectorService.ServiceBinder) service;
-            detectorService = binder.getBoundService();
-            detectorService.videoDetector.debugProcessing(null, outputImageView); //inputImageView
+}
 
-            detectorService.setOnDetectionListener(new DetectorService.OnDetectionListener() {
-                @Override
-                public void onDetection(@NonNull StringBuffer stringBuffer) {
-                    Log.d("onDetection", stringBuffer.toString()); //Für oli hier Textview einbauen
-                    num++;
-                }
-            });
-        }
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-        }
-    };
-}

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

@@ -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) {
-                RechteAnfordern();
+            public void onClick(View v) {RechteAnfordern();
             }
         });
 
@@ -82,7 +81,5 @@ public class PopUpClass {
     public void Impressum(){
         PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert");
     }
-    public void DetectionTotal(int num) {
-        PopUpText.setText("Total Detektions:" +num);
-    }
+
 }

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

@@ -31,11 +31,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) {
@@ -66,11 +61,11 @@ public class WifiCommunication {
     public void sendWifiData(String wifiMessage) {
         if (listener != null) {
             listener.onConnection(wifiMessage);
-
         }
     }
 
     private class ReceiveThread extends Thread {
+        private StringBuffer rxStringBuffer = new StringBuffer();
         private String rxString="";
         private String previousRxString = "";
 
@@ -83,30 +78,13 @@ public class WifiCommunication {
                     socket.receive(rxPacket);
                     rxString = new String(receiveData, 0, rxPacket.getLength());
                     String[] splitrxString = rxString.split(",");
-                    String[] splitrxStringBuffer = splitBufferIntoStrings(rxStringBuffer);
-                    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(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;
-                        }
+                    Log.d("empfangen", rxString);
+                    if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7) {
+                        //rxStringBuffer.append(rxString).append("\n");
+                        sendWifiData(rxString);
+
+                        //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
+                        previousRxString = rxString;
                     }
                 } while (running);
             }
@@ -124,18 +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 = (messageToSend); //"1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video,"
-                        Log.d("send", txString);
+                        String txString = (messageToSend);
                         send_Data = txString.getBytes();
 
                         DatagramPacket txPacket = new DatagramPacket(send_Data, txString.length(), address, port);
 
                         for(int i = 0; i < 500; i++) {
                             socket.send(txPacket);
+                            Log.d("senden", txPacket.getData().toString());
                         }
                     }
                 } while (running);
@@ -169,8 +144,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/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>