- 'removed' files added to project

- work in Progress

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

@@ -3,6 +3,7 @@ package com.example.ueberwachungssystem.Detection;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
+import android.util.Log;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
@@ -10,6 +11,8 @@ import androidx.annotation.Nullable;
 import androidx.camera.core.ExperimentalGetImage;
 import androidx.lifecycle.LifecycleService;
 
+import com.example.ueberwachungssystem.WifiCommunication;
+
 import java.io.File;
 
 @ExperimentalGetImage
@@ -24,12 +27,38 @@ public class DetectorService extends LifecycleService {
     public Accelerometer motionDetector = null;
     public MicrophoneDetector audioDetector = null;
 
+    public WifiCommunication wifiCommunication;
+
+    String wifiData;
+    StringBuffer stringBufferWifi = new StringBuffer();
+
+    String typOfAlarm;
+
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (isServiceRunning)
             return START_NOT_STICKY;
 
+        /** Wifi Instanz **/
+        wifiCommunication = new WifiCommunication(1234);
+        wifiCommunication.sendTrue("TEst");
+
+        wifiCommunication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() {
+            @Override
+            public void onConnection(String data) {
+                Log.d("Listener", data);
+                wifiData = data;
+                stringToStringbuffer(data);
+                Log.d("buffer",stringBufferWifi.toString());
+                passToServiceListener(stringBufferWifi);
+                checkState(data);
+                checkTyp(data);
+
+            }
+        });
+
+
 
 
 
@@ -38,7 +67,8 @@ public class DetectorService extends LifecycleService {
         videoDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                passToServiceListener(detectionReport);
+                //passToServiceListener(detectionReport);
+                wifiCommunication.sendTrue(detectionReport.toMessage());
             }
         });
         /** Motion Detection**/
@@ -47,7 +77,8 @@ public class DetectorService extends LifecycleService {
         motionDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                passToServiceListener(detectionReport);
+                //passToServiceListener(detectionReport);
+                wifiCommunication.sendTrue(detectionReport.toMessage());
             }
         });
         /** Audio Detection **/
@@ -55,7 +86,8 @@ public class DetectorService extends LifecycleService {
         audioDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
             @Override
             public void onDetection(@NonNull DetectionReport detectionReport) {
-                passToServiceListener(detectionReport);
+                //passToServiceListener(detectionReport);
+                wifiCommunication.sendTrue(detectionReport.toMessage());
             }
         });
         /** Audio Recorder**/
@@ -92,18 +124,44 @@ public class DetectorService extends LifecycleService {
 
 
     /** Pass Detection Report to Service Detection Listener and trigger it */
-    public void passToServiceListener(DetectionReport detectionReport) {
+    public void passToServiceListener(StringBuffer stringBuffer) {
         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;
     }
+
+    public void stringToStringbuffer(String string){
+        if(string != null) {
+            stringBufferWifi.insert(0,string + "\n");
+        }
+    }
+
+    public String[] splitString(String string){
+        String[] splitrxString = string.split(",");
+        return splitrxString; //splitrxString[0] = "1",splitrxString[1] = "HH:MM:SS", splitrxString[0].equals("1")
+
+    }
+
+
+    public boolean checkState(String string){
+        Log.d("state", String.valueOf(splitString(string)[4].equals("An")));
+        return splitString(string)[4].equals("An");
+    }
+
+    public String checkTyp(String string){
+        if (splitString(string)[5] != null) {
+            typOfAlarm = splitString(string)[5];
+            Log.d("Type",  typOfAlarm);
+        }
+        return typOfAlarm;
+    }
 }

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

@@ -1,20 +1,25 @@
 package com.example.ueberwachungssystem.Fragments;
 
+import android.content.Context;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.VideoView;
 
 import androidx.fragment.app.Fragment;
 
 import com.example.ueberwachungssystem.R;
 
+import java.io.File;
+
 public class Fragment1 extends Fragment {
     private String text;
     private final static String KEY_TEXT = "KEY_TEXT";
-
     private void log(String nachricht) {
         Log.d(this.getClass().getSimpleName(), nachricht);
     }
@@ -23,7 +28,7 @@ public class Fragment1 extends Fragment {
     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);
+        TextView Sensor = (TextView) view.findViewById(R.id.Alarm);
         Sensor.setText(text);
         return view;
     }
@@ -36,7 +41,7 @@ public class Fragment1 extends Fragment {
     }
     @Override
     public void onCreate(Bundle bundle) {
-        super .onCreate(bundle);
+        super.onCreate(bundle);
         Bundle args = getArguments();
         if (args != null ) {
             text = args.getString(KEY_TEXT);

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

@@ -1,18 +1,28 @@
 package com.example.ueberwachungssystem.Fragments;
 
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
 import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
 
+import com.example.ueberwachungssystem.MeinAdapter;
 import com.example.ueberwachungssystem.R;
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
 public class Fragment2 extends Fragment {
     private String text;
+    private Context c;
     private final static String KEY_TEXT = "KEY_TEXT" ;
     private void log(String nachricht) {
         Log.d(this.getClass().getSimpleName(), nachricht);
@@ -21,8 +31,8 @@ public class Fragment2 extends Fragment {
     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);
+//        TextView Sensor = (TextView) view.findViewById(R.id.Aufzeichnungen);
+//        Sensor.setText(text);
         return view;
     }
     public static Fragment2 erstellen(String text) {
@@ -36,6 +46,9 @@ public class Fragment2 extends Fragment {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         Bundle args = getArguments();
+        c = getContext();
+        ListView listView = new ListView(c);
+        listView.setAdapter(new MeinAdapter(c, getVideoFiles()));
         if (args != null) {
             text = args.getString(KEY_TEXT);
             log("onCreate: text=" + text);
@@ -43,4 +56,10 @@ public class Fragment2 extends Fragment {
             log("onCreate");
         }
     }
+    public List<File> getVideoFiles(){
+        File directory = c.getFilesDir();
+        File[] files = directory.listFiles();
+        assert files != null;
+        return Arrays.asList(files);
+    }
 }

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

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

@@ -1,9 +1,10 @@
 package com.example.ueberwachungssystem;
 
+import androidx.camera.core.ExperimentalGetImage;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.camera.core.ExperimentalGetImage;
-import androidx.camera.view.PreviewView;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -12,86 +13,130 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.util.Log;
+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 com.example.ueberwachungssystem.Detection.DetectionReport;
-import com.example.ueberwachungssystem.Detection.Detector;
+import com.example.ueberwachungssystem.Fragments.Fragment1;
+import com.example.ueberwachungssystem.Fragments.Fragment2;
 import com.example.ueberwachungssystem.Detection.DetectorService;
-import com.example.ueberwachungssystem.Detection.MicrophoneDetector;
-import com.example.ueberwachungssystem.Detection.VideoDetector;
 
 @ExperimentalGetImage
 public class MainActivity extends AppCompatActivity {
+    //Fragmente
+    private Fragment aktuellesFragment;
+    private Fragment1 fragment1;
+    private Fragment2 fragment2;
 
     private DetectorService detectorService = new DetectorService();
-    ImageView inputImageView;
-    ImageView outputImageView;
-    ToggleButton toggleButton;
+    int num=0;
+    //Textviews
+    private TextView Auswahl;
+    private TextView AoderA;
+    private String auswahltext = "Wahl des Detektionsmodus";
+    private String auswahlAoderA = "Wahl von Alarmmeldungen oder Auswahl von Alarmaufzeichnungen";
+    //Buttons
+    private ToggleButton toggleKamera;
+    private ToggleButton toggleAudio;
+    private ToggleButton toggleBewegung;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setTitle(this.getClass().getSimpleName());
         setContentView(R.layout.activity_main);
+        Auswahl = findViewById(R.id.textAuswahl);
+        Auswahl.setText(auswahltext);
+        AoderA = findViewById(R.id.textAoderA);
+        AoderA.setText(auswahlAoderA);
+        toggleKamera = findViewById(R.id.toggleKamera);
+        toggleAudio = findViewById(R.id.toggleAudio);
+        toggleBewegung = findViewById(R.id.toggleBewegung);
+    }
 
-
-        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();
+        //permissionHandler.getPermissions();
         if (permissionHandler.hasPermissions()) {
 
-
             Intent serviceIntent = new Intent(this, DetectorService.class);
             bindService(serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE);
             startService(serviceIntent);
 
-
-            toggleButton.setOnClickListener(new View.OnClickListener() {
+            toggleKamera.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if (toggleButton.isChecked())
-                    {
-                        if (detectorService != null){
+                    if (toggleKamera.isChecked()) {
 
-                            detectorService.videoDetector.debugProcessing(inputImageView, outputImageView);
-                            detectorService.videoDetector.startDetection();
+                    } else {
 
-                            detectorService.audioDetector.startDetection();
-
-                            detectorService.motionDetector.startDetection();
-
-                            detectorService.audioRecorder.stopRecording();
-
-                            detectorService.videoDetector.startRecording();
-                        }
-                    }
-                    else {
-                        detectorService.videoDetector.stopDetection();
-
-                        detectorService.audioDetector.stopDetection();
-
-                        detectorService.motionDetector.stopDetection();
-
-                        detectorService.audioRecorder.stopRecording();
-
-                        detectorService.videoDetector.stopRecording();
                     }
                 }
             });
+            toggleAudio.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (toggleAudio.isChecked()) {
 
+                    } else {
 
+                    }
+                }
+            });
+            toggleBewegung.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (toggleBewegung.isChecked()) {
 
+                    } else {
 
+                    }
+                }
+            });
+        }else{
+            Toast.makeText(this,"Bitte Rechte geben", Toast.LENGTH_SHORT).show();
+        }
 
+    }
 
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.options_menu, menu);
+        return true;
+    }
 
+    public boolean onOptionsItemSelected(MenuItem item) {
+        Toast.makeText(this, "Selected Item: " + item.getTitle(), Toast.LENGTH_SHORT).show();
+        PopUpClass popUpClass;
+        switch (item.getItemId()) {
+            case R.id.Rechteverwaltung:
+                popUpClass = new PopUpClass(MainActivity.this);
+                popUpClass.showPopupWindow(toggleAudio);
+                popUpClass.RechtePrüfen();
+                return true;
+            case R.id.Sensoren:
+                popUpClass = new PopUpClass(MainActivity.this);
+                popUpClass.showPopupWindow(toggleAudio);
+                popUpClass.Sensoren();
+                return true;
+            case R.id.Impressum:
+                popUpClass = new PopUpClass(MainActivity.this);
+                popUpClass.showPopupWindow(toggleAudio);
+                popUpClass.Impressum();
+                return true;
+            case R.id.Detection:
+                popUpClass = new PopUpClass(MainActivity.this);
+                popUpClass.showPopupWindow(toggleAudio);
+                popUpClass.DetectionTotal(num);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
         }
     }
 
@@ -100,15 +145,47 @@ public class MainActivity extends AppCompatActivity {
         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 DetectionReport detectionReport) {
-                    Log.d("onDetection", detectionReport.toMessage());
+                public void onDetection(@NonNull StringBuffer stringBuffer) {
+                    Log.d("onDetection", stringBuffer.toString()); //Für oli hier Textview einbauen
+                    num++;
                 }
             });
         }
         @Override
-        public void onServiceDisconnected(ComponentName name) {}
+        public void onServiceDisconnected(ComponentName name) {
+        }
     };
+
+    public void onClickZeigeFragment1(View view) {
+        Button button = (Button) view;
+        zeigeFragment(fragment1.erstellen("Hier stehen dann die Alarme"));
+    }
+
+    public void onClickZeigeFragment2(View view) {
+        Button button = (Button) view;
+        zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos"));
+    }
+
+    public void onClickEntferneFragment(View view) {
+        entferneFragment();
+    }
+
+    private void zeigeFragment(Fragment fragment) {
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        ft.replace(R.id.frame, fragment);
+        ft.commit();
+        aktuellesFragment = fragment;
+    }
+    private void entferneFragment() {
+        if (aktuellesFragment != null) {
+            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+            ft.remove(aktuellesFragment);
+            ft.commit();
+            aktuellesFragment = null ;
+        }
+    }
 }

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

@@ -0,0 +1,31 @@
+package com.example.ueberwachungssystem;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+
+import java.io.File;
+import java.util.List;
+
+public class MeinAdapter extends ArrayAdapter<File> {
+    private Context context;
+    private File[] files;
+    public MeinAdapter(Context context, List<File> listf) {
+        super(context, android.R.layout.simple_list_item_1, listf);
+        this.context = context;
+    }
+
+    @Override
+    public View getView(final int pos, View cv, ViewGroup vg) {
+        View v = super.getView(pos, cv, vg);
+        v.setOnClickListener( new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                    Log.d("DerLog","nicht null");
+            }
+        });
+        return v;
+    }
+}

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_LONG).show();
+                    Toast.makeText(mainActivity.getApplicationContext(),"Es werden Rechte benötigt", Toast.LENGTH_SHORT).show();
                 }
             });
         }

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

@@ -15,6 +15,8 @@ public class PopUpClass {
     PermissionRequest permission;
     TextView PopUpText;
 
+    Button buttonEdit;
+
 
     public PopUpClass(MainActivity mainActivity) {
         this.mainActivity = mainActivity;
@@ -47,7 +49,7 @@ public class PopUpClass {
 
         PopUpText = popupView.findViewById(R.id.titleText);
 
-        Button buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
+        buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
         buttonEdit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -70,17 +72,25 @@ public class PopUpClass {
     public void RechtePrüfen(){
         StringBuilder Text = permission.rechtePruefen();
         PopUpText.setText(Text);
+        buttonEdit.setVisibility(View.VISIBLE);
+
     }
     public void RechteAnfordern(){
         permission.rechteAnfordern();
         StringBuilder Text = permission.rechtePruefen();
         PopUpText.setText(Text);
+
     }
     public void Sensoren(){
         PopUpText.setText("Es können 3 verschiedene Sensoren verwendet werden \n -1. Beschleunigungssensor\n -2. Mikrofon\n -3. Kamera");
+        buttonEdit.setVisibility(View.GONE);
     }
     public void Impressum(){
         PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert");
+        buttonEdit.setVisibility(View.GONE);
+    }
+    public void DetectionTotal(int num) {
+        PopUpText.setText("Total Detektions:" +num);
+        buttonEdit.setVisibility(View.GONE);
     }
-
 }

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

@@ -1,5 +1,6 @@
 package com.example.ueberwachungssystem;
 import android.annotation.SuppressLint;
+import android.util.Log;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -30,6 +31,11 @@ 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) {
@@ -51,20 +57,20 @@ 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);
+
         }
     }
 
     private class ReceiveThread extends Thread {
-        private StringBuffer rxStringBuffer = new StringBuffer();
         private String rxString="";
         private String previousRxString = "";
 
@@ -77,12 +83,31 @@ public class WifiCommunication {
                     socket.receive(rxPacket);
                     rxString = new String(receiveData, 0, rxPacket.getLength());
                     String[] splitrxString = rxString.split(",");
-                    if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7) {
+                    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");
-                        sendWifiData(rxStringBuffer);
+                            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;
+                        }
+                    }
                 } while (running);
             }
             catch (IOException e) {
@@ -99,16 +124,17 @@ public class WifiCommunication {
                     if(send)
                     {
                         send = false;
-                        SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
+                        /*SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
                         Date curDate = new Date(System.currentTimeMillis());
-                        String str = formatter.format(curDate);
+                        String str = formatter.format(curDate);*/
                         byte[] send_Data = new byte[512];
-                        String txString = ("1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video," +messageToSend);
+                        String txString = (messageToSend); //"1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video,"
+                        Log.d("send", txString);
                         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);
                         }
                     }
@@ -143,4 +169,8 @@ public class WifiCommunication {
         running = false;
         socket.close();
     }
+    public String[] splitBufferIntoStrings(StringBuffer string){
+        String[] splitrxString2 = string.toString().split("\n");
+        return splitrxString2;
+    }
 }

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

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

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

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

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

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

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

@@ -4,19 +4,23 @@
     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"/>
+    android:background="@color/bluedark">
 
+    <ScrollView
+        android:id="@+id/scrollView1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="25dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
             <TextView
                 android:id="@+id/Alarm"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-        android:layout_below="@id/Sensor"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+                android:textColor="@color/yellow"/>
+        </LinearLayout>
+    </ScrollView>
 
 </RelativeLayout>

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

@@ -6,17 +6,28 @@
     android:orientation="vertical"
     android:background="@android:color/holo_blue_light" >
 
+    <ScrollView
+        android:id="@+id/scrollView2"
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:layout_marginTop="25dp">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
             <TextView
-        android:id="@+id/Sensor"
+                android:id="@+id/Aufzeichnungen"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
+                android:textColor="@color/yellow"/>
+        </LinearLayout>
+    </ScrollView>
 
-    <TextView
-        android:id="@+id/Alarm"
+    <VideoView
+        android:id="@+id/AusAuf"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/Sensor"
+        android:layout_below="@id/scrollView2"
         android:textAppearance="?android:attr/textAppearanceLarge"/>
 
 </LinearLayout>

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

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:background="@android:color/holo_blue_light" >
-
-    <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/menu/options_menu.xml

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

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

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

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

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