WIP: audio recorder

Notiz.txt

@@ -1,3 +0,0 @@
-Sensor als Service einrichten, der aus Activity heraus gestartet werden kann.
-Stichwort: Intent
-Siehe Skript Teil 1

app/build.gradle

@@ -26,9 +26,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    buildFeatures {
-        viewBinding true
-    }
 }
 
 dependencies {
@@ -36,21 +33,12 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.android.gms:play-services-nearby:18.0.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-
-    // OpenCV (from: https://github.com/QuickBirdEng/opencv-android)
-    def opencv_version = "4.5.3.0"
-    implementation "com.quickbirdstudios:opencv:${opencv_version}"
-
-    implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
-
-
     // Required for CameraX
-    def camerax_version = "1.2.2"
+    def camerax_version = "1.2.3"
     implementation "androidx.camera:camera-core:${camerax_version}"
     implementation "androidx.camera:camera-camera2:${camerax_version}"
     implementation "androidx.camera:camera-lifecycle:${camerax_version}"

app/src/main/AndroidManifest.xml

@@ -3,12 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-feature android:name="android.hardware.camera"/>
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:allowBackup="true"
@@ -28,7 +25,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-    <service android:name=".Detection.DetectorService"/>
     </application>
 
 </manifest>

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

@@ -0,0 +1,76 @@
+package com.example.ueberwachungssystem;
+
+import android.content.Context;
+import android.hardware.Camera;
+import android.media.CamcorderProfile;
+import android.media.MediaPlayer;
+import android.media.MediaRecorder;
+import android.util.Log;
+import android.view.SurfaceView;
+import android.widget.VideoView;
+
+import java.io.File;
+import java.io.IOException;
+
+public class AudioRecorder {
+    private final Context context;
+    private Camera camera;
+    private MediaRecorder mediaRecorder = null;
+    private SurfaceView surfaceView;
+
+    public AudioRecorder (Context context) {
+        this.context = context;
+        this.surfaceView = new SurfaceView(context);
+    }
+
+
+    public void startRecording() {
+
+        mediaRecorder = new MediaRecorder();
+
+        mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+        mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+        mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+        mediaRecorder.setOutputFile(context.getFilesDir() + "/audio.mp3");
+
+
+        try {
+            mediaRecorder.prepare();
+            mediaRecorder.start();
+        } catch (IOException e) {
+            Log.e("audioRecorder", "prepare() failed");
+        }
+    }
+
+    public void stopRecording() {
+        if (mediaRecorder != null) {
+            try {
+                mediaRecorder.stop();
+                mediaRecorder.release();
+                mediaRecorder = null;
+            } catch (RuntimeException e) {
+                // RuntimeException may be thrown if the MediaRecorder is in an invalid state
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void playAudio() {
+        MediaPlayer mp = new MediaPlayer();
+        try {
+            mp.setDataSource(context.getFilesDir() + "/audio.mp3");
+            mp.prepare();
+            mp.start();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public void deleteRecording(){
+        File file = new File(context.getFilesDir() + "/audio.mp3");
+        if (file.exists()) {
+            file.delete();
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.util.Log;
+
+import java.util.Calendar;
+
+/** Detection Report Class */
+public class DetectionReport {
+    public String timeStamp;
+    public String detectionType;
+    public float detectedValue;
+    public String detectorID;
+
+    public DetectionReport(String detectorID, String detectionType, float detectedAmplitude) {
+        this.timeStamp = String.valueOf(Calendar.getInstance().getTime());
+        this.detectionType = detectionType;
+        this.detectedValue = detectedAmplitude;
+        this.detectorID = detectorID;
+    }
+
+
+    /** Get Detection Report in String format */
+    public String toString() {
+        String time = "Time: " + "[" + this.timeStamp + "]";
+        String type = "Type: " + "[" + this.detectionType + "]";
+        String value = "Value: " + "[" + this.detectedValue + "]";
+        String id = "ID: " + "[" + this.detectorID + "]";
+
+        return String.join("\t", time, type, value, id);
+    }
+
+    /** Debug Report */
+    public void log(String tag) {
+        Log.d(tag, this.toString());
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.example.ueberwachungssystem.Detection;
+
+import androidx.annotation.NonNull;
+
+
+abstract public class Detector {
+    private OnDetectionListener listener;
+
+    /** Constructor - takes context of current activity */
+    public Detector() {}
+
+
+    /** On Detection Listener - runs when violation is reported */
+    public interface OnDetectionListener {
+        void onDetection(@NonNull DetectionReport detectionReport);
+    }
+    public void setOnDetectionListener(@NonNull OnDetectionListener listener) {
+        this.listener = listener;
+    }
+
+
+    /** Triggers onDetectionListener - call this to trigger violation/alarm */
+    public void reportViolation(String detectorID, String detectionType, float amplitude) {
+        if (listener != null) {
+            DetectionReport detectionReport = new DetectionReport(detectorID, detectionType, amplitude);
+            listener.onDetection(detectionReport);
+        } else {
+            throw new IllegalStateException("No listener set for violation reporting");
+        }
+    }
+
+
+    /** Starts Detection (abstract method: needs to be overridden in child class) */
+    public abstract void startDetection();
+
+    /** Stops Detection (abstract method: needs to be overridden in child class) */
+    public abstract void stopDetection();
+}

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

@@ -0,0 +1,257 @@
+package com.example.ueberwachungssystem.Detection;
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.ImageFormat;
+import android.media.Image;
+import android.util.Size;
+import android.view.Surface;
+import android.widget.Toast;
+import android.widget.VideoView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ExperimentalGetImage;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.Preview;
+import androidx.camera.core.VideoCapture;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.io.File;
+import java.nio.ByteBuffer;
+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);
+ * vd.setPreview(previewView);  //THIS IS OPTIONAL!
+ * vd.setOnDetectionListener(new Detector.OnDetectionListener{...});
+ * vd.startDetection();
+ * vd.stopDetection
+ *
+ * */
+
+
+@ExperimentalGetImage
+public class VideoDetector extends Detector {
+
+    // Calling Activity
+    private final Context context;
+    // Camera Provider
+    private ProcessCameraProvider cameraProvider;
+    private Boolean isDetectionRunning = false;
+    // Preview Camera Image
+    private PreviewView previewView = null;
+    private VideoCapture videoCapture = null;
+    // Detect Violation
+    private static final float PIXEL_THRESHOLD = 30f;  // Luminosity (brightness channel of YUV_420_888)
+    private static final float ALARM_THRESHOLD = 0.2f;   // Percent of pixels changed
+    private ByteBuffer previousBuffer = null;
+
+
+    /**
+     * Constructor
+     * @param context: the context of calling activity (usually "this")
+     * */
+    public VideoDetector(Context context) {
+        super();
+        this.context = context;
+    }
+
+
+    /**
+     *  Starts the Video Detection
+     * */
+    @Override
+    public void startDetection() {
+        if (isDetectionRunning)
+            return;
+        // Request Camera Provider
+        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
+        //Check for Camera availability
+        cameraProviderFuture.addListener(() -> {
+            try {
+                cameraProvider = cameraProviderFuture.get();
+                bindAnalysis(cameraProvider);
+                isDetectionRunning = true;
+                previousBuffer = null;
+            } catch (ExecutionException | InterruptedException e) {
+                // No errors need to be handled for this Future. This should never be reached.
+            }
+        }, ContextCompat.getMainExecutor(context));
+    }
+
+
+    /**
+     * Stops the Video Detection
+     * */
+    @Override
+    public void stopDetection() {
+        if (!isDetectionRunning)
+            return;
+        cameraProvider.unbindAll();
+        isDetectionRunning = false;
+    }
+
+
+    /**
+     * Set PreviewView to show video feed while detecting
+     * this is optional and does not need to be called
+     * */
+    public void setPreviewView(PreviewView previewView) {
+        this.previewView = previewView;
+    }
+
+
+    /**
+     * Binds the Luminosity Analyzer (configure and run Analysis)
+     * @param cameraProvider: CameraProvider of Context passed by Constructor
+     * */
+    @SuppressLint("RestrictedApi")
+    private void bindAnalysis(@NonNull ProcessCameraProvider cameraProvider) {
+        // Configure and create Image Analysis
+        ImageAnalysis.Builder builder = new ImageAnalysis.Builder();
+        builder.setTargetResolution(new Size(640, 480));
+        builder.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST);
+        builder.setOutputImageFormat(ImageAnalysis.OUTPUT_IMAGE_FORMAT_YUV_420_888);
+        ImageAnalysis imageAnalysis = builder.build();
+
+        // Set Analyzer
+        imageAnalysis.setAnalyzer(ContextCompat.getMainExecutor(context), imageProxy -> {
+            if (imageProxy.getFormat() == ImageFormat.YUV_420_888) {
+                Image image = imageProxy.getImage();
+                assert image != null;
+
+                // Changed Pixel Detection
+                int pixelChanged = getChangedPixelCount(image);
+                int width = image.getWidth();
+                int height = image.getHeight();
+
+                float percentPixelChanged = (float) 100f * pixelChanged / (width * height);
+
+                if (percentPixelChanged > ALARM_THRESHOLD)
+                    reportViolation("0", "Video", percentPixelChanged);
+            }
+            imageProxy.close();
+        });
+        // Create Preview
+        Preview preview = new Preview.Builder().build();
+        // Specify which Camera to use
+        CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
+        // Update PreviewView if set
+        if (previewView != null)
+            preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        videoCapture = new VideoCapture.Builder()
+                .setVideoFrameRate(30)
+                .setTargetRotation(Surface.ROTATION_0)
+                .build();
+
+
+        cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, videoCapture);
+    }
+
+
+    @SuppressLint("RestrictedApi")
+    public void startRecording() {
+
+        File dir = context.getFilesDir();
+        String filename = "recording";
+        String vidFilePath = dir.getAbsolutePath() + "/" + filename + ".mp4";
+        File vidFile = new File(vidFilePath);
+
+        if (ActivityCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+            // TODO: Consider calling
+            //    ActivityCompat#requestPermissions
+            // here to request the missing permissions, and then overriding
+            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+            //                                          int[] grantResults)
+            // to handle the case where the user grants the permission. See the documentation
+            // for ActivityCompat#requestPermissions for more details.
+            return;
+        }
+        videoCapture.startRecording(
+                new VideoCapture.OutputFileOptions.Builder(vidFile).build(),
+                context.getMainExecutor(),
+                new VideoCapture.OnVideoSavedCallback() {
+                    @Override
+                    public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
+                        Toast.makeText(context, "recording saved", Toast.LENGTH_SHORT).show();
+                    }
+
+                    @Override
+                    public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
+                        Toast.makeText(context, "recording failed", Toast.LENGTH_SHORT).show();
+                    }
+                }
+        );
+    }
+
+    @SuppressLint("RestrictedApi")
+    public void stopRecording(){
+        videoCapture.stopRecording();
+    }
+
+    /**
+     * Calculate Amount of Pixels changed using a threshold
+     * @param image
+     * */
+    private int getChangedPixelCount(Image image) {
+        Image.Plane[] planes = image.getPlanes();
+        ByteBuffer buffer = planes[0].getBuffer();
+
+        if (previousBuffer == null) {
+            previousBuffer = ByteBuffer.allocate(buffer.capacity());
+            buffer.rewind();
+            previousBuffer.put(buffer);
+            previousBuffer.rewind();
+            return 0;
+        }
+
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        int yRowStride = image.getPlanes()[0].getRowStride();
+        int yPixelStride = image.getPlanes()[0].getPixelStride();
+
+        int changedPixelCount = 0;
+
+        // Count changed pixels
+        for (int y = 0; y < height; ++y) {
+            for (int x = 0; x < width; x++) {
+                int index = (y * yRowStride) + (x * yPixelStride);
+                int luminosity = (buffer.get(index) & 0xff);
+                int previousLuminosity = (previousBuffer.get(index) & 0xff);
+                int diff = Math.abs(luminosity - previousLuminosity);
+                if (diff > PIXEL_THRESHOLD)
+                    changedPixelCount++;
+            }
+        }
+
+        // Reset and copy Byte Buffer
+        buffer.rewind();
+        previousBuffer.rewind();
+        previousBuffer.put(buffer);
+
+        return changedPixelCount;
+    }
+
+    public void playVideo(VideoView videoView) {
+        videoView.setVideoPath(context.getFilesDir() + "/recording.mp4");
+        videoView.start();
+    }
+}

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

@@ -0,0 +1,147 @@
+package com.example.ueberwachungssystem;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.media.MediaPlayer;
+import android.view.Surface;
+import android.widget.Toast;
+import android.widget.VideoView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.Preview;
+import androidx.camera.core.VideoCapture;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.io.File;
+import java.util.concurrent.ExecutionException;
+
+public class DetectionRecorder {
+
+    private final Context context;
+    private ProcessCameraProvider cameraProvider;
+    private VideoCapture videoCapture = null;
+    private PreviewView previewView = null;
+    private boolean isRunning = false;
+    private boolean isVideoPlaying = false;
+
+
+    // Constructor
+    public DetectionRecorder(Context context) {
+        this.context = context;
+    }
+
+
+    public void start() {
+        if (isRunning)
+            return;
+        isRunning = true;
+
+        // Request Camera Provider
+        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(context);
+        //Check for Camera availability
+        cameraProviderFuture.addListener(() -> {
+            try {
+                cameraProvider = cameraProviderFuture.get();
+                startCameraX(cameraProvider);
+            } catch (ExecutionException | InterruptedException e) {
+                // No errors need to be handled for this Future. This should never be reached.
+            }
+        }, ContextCompat.getMainExecutor(context));
+    }
+
+
+    @SuppressLint("RestrictedApi")
+    public void stop() {
+        if (!isRunning)
+            return;
+
+        videoCapture.stopRecording();
+        cameraProvider.unbind(videoCapture);
+        isRunning = false;
+    }
+
+    @SuppressLint("RestrictedApi")
+    private void startCameraX(ProcessCameraProvider cameraProvider) {
+        //cameraProvider.unbindAll();
+
+        CameraSelector cameraSelector = new CameraSelector.Builder()
+                .requireLensFacing(CameraSelector.LENS_FACING_BACK)
+                .build();
+
+        // Preview Use Case
+        Preview preview = new Preview.Builder().build();
+        if (previewView != null)
+            preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        // Video Capture Use Case
+        videoCapture = new VideoCapture.Builder()
+                .setVideoFrameRate(30)
+                .setTargetRotation(Surface.ROTATION_0)
+                .build();
+
+        cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, preview, videoCapture);
+
+
+        File dir = context.getFilesDir();
+        String filename = "recording";
+        String vidFilePath = dir.getAbsolutePath() + "/" + filename + ".mp4";
+        File vidFile = new File(vidFilePath);
+
+        if (ActivityCompat.checkSelfPermission(context, android.Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+            // TODO: Consider calling
+            //    ActivityCompat#requestPermissions
+            // here to request the missing permissions, and then overriding
+            //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+            //                                          int[] grantResults)
+            // to handle the case where the user grants the permission. See the documentation
+            // for ActivityCompat#requestPermissions for more details.
+            return;
+        }
+        videoCapture.startRecording(
+                new VideoCapture.OutputFileOptions.Builder(vidFile).build(),
+                context.getMainExecutor(),
+                new VideoCapture.OnVideoSavedCallback() {
+                    @Override
+                    public void onVideoSaved(@NonNull VideoCapture.OutputFileResults outputFileResults) {
+                        Toast.makeText(context, "recording saved", Toast.LENGTH_SHORT).show();
+                    }
+                    @Override
+                    public void onError(int videoCaptureError, @NonNull String message, @Nullable Throwable cause) {
+                        Toast.makeText(context, "recording failed", Toast.LENGTH_SHORT).show();
+                    }
+                }
+        );
+    }
+
+    /** Set PreviewView to show Image */
+    public void setPreviewView(PreviewView previewView) {
+        this.previewView = previewView;
+    }
+
+    private void playAudio() {
+        MediaPlayer mp = new MediaPlayer();
+        try {
+            mp.setDataSource(context.getFilesDir() + "/audio.gpp");
+            mp.prepare();
+            mp.start();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void playVideo(VideoView videoView) {
+        if (isVideoPlaying)
+            return;
+        videoView.setVideoPath(context.getFilesDir() + "/recording.mp4");
+        videoView.start();
+    }
+}

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

@@ -1,53 +0,0 @@
-package com.example.ueberwachungssystem.Fragments;
-
-import android.content.Context;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Environment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.VideoView;
-
-import androidx.fragment.app.Fragment;
-
-import com.example.ueberwachungssystem.R;
-
-import java.io.File;
-
-public class Fragment1 extends Fragment {
-    private String text;
-    private final static String KEY_TEXT = "KEY_TEXT";
-    private void log(String nachricht) {
-        Log.d(this.getClass().getSimpleName(), nachricht);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-        log("onCreateView");
-        View view = inflater.inflate(R.layout.fragment1, container, false);
-        TextView Sensor = (TextView) view.findViewById(R.id.Alarm);
-        Sensor.setText(text);
-        return view;
-    }
-    public static Fragment1 erstellen(String text) {
-        Fragment1 fragment = new Fragment1();
-        Bundle b = new Bundle();
-        b.putString(KEY_TEXT, text);
-        fragment.setArguments(b);
-        return fragment;
-    }
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        Bundle args = getArguments();
-        if (args != null ) {
-            text = args.getString(KEY_TEXT);
-            log("onCreate: text=" + text);
-        } else {
-            log("onCreate");
-        }
-    }
-}

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

@@ -1,66 +0,0 @@
-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);
-    }
-    @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.Aufzeichnungen);
-//        Sensor.setText(text);
-        return view;
-    }
-    public static Fragment2 erstellen(String text) {
-        Fragment2 fragment = new Fragment2();
-        Bundle b = new Bundle();
-        b.putString(KEY_TEXT, text);
-        fragment.setArguments(b);
-        return fragment;
-    }
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-        Bundle args = getArguments();
-        c = getContext();
-        ListView listView = new ListView(c);
-        setContentView(R.layout.fragment2);
-        listView.setAdapter(new MeinAdapter(c, getVideoFiles()));
-        if (args != null) {
-            text = args.getString(KEY_TEXT);
-            log("onCreate: text=" + text);
-        } else {
-            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/Logger/Logger.java

@@ -1,44 +0,0 @@
-package com.example.ueberwachungssystem.Logger;
-
-import android.util.Log;
-import android.widget.TextView;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-public class Logger {
-    private TextView textView;
-    private StringBuffer sb = new StringBuffer();
-    private String tag;
-
-    public Logger(String tag, TextView textView, String logInitText)  {
-        this.tag = tag;
-        this.textView = textView;
-        sb.append(logInitText);
-    }
-
-    public void log(String s)  {
-        Log.d(tag, s);
-        sb.append(s).append("\n");
-        if (textView != null) {
-            textView.setText(sb.toString());
-        }
-    }
-
-    public void log(Exception e)  {
-        StringWriter sw = new StringWriter();
-        e.printStackTrace(new PrintWriter(sw));
-        log(sw.toString());
-    }
-
-    public void clearLog()  {
-        sb.setLength(0);
-        if (textView != null) {
-            textView.setText("");
-        }
-    }
-
-    public String getLoggedText()  {
-        return sb.toString();
-    }
-}

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

@@ -1,126 +1,120 @@
 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.view.PreviewView;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.camera.core.ExperimentalGetImage;
 
+import android.Manifest;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.ToggleButton;
+import android.widget.VideoView;
 
-import com.example.ueberwachungssystem.Fragments.Fragment1;
-import com.example.ueberwachungssystem.Fragments.Fragment2;
+import com.example.ueberwachungssystem.Detection.DetectionReport;
+import com.example.ueberwachungssystem.Detection.Detector;
+import com.example.ueberwachungssystem.Detection.VideoDetector;
+
+import java.io.File;
+import java.util.Arrays;
 
 @ExperimentalGetImage
-public class MainActivity extends AppCompatActivity implements View.OnClickListener {
-    //Fragmente
-    private Fragment aktuellesFragment;
-    private Fragment1 fragment1;
-    private Fragment2 fragment2;
+public class MainActivity extends AppCompatActivity {
 
-    //Textviews
-    private TextView Auswahl;
-    private TextView AoderA;
-    private String auswahltext = "Wahl des Detektionsmodus";
-    private String auswahlAoderA = "Wahl von Alarmmeldungen oder Auswahl von Alarmaufzeichnungen";
+    private static final int PERMISSION_REQUEST_CODE = 111;
 
-    //Sensoren und Kommunikation
-    WifiCommunication communication;
-    //Buttons
-    private ToggleButton toggleKamera;
-    private ToggleButton toggleAudio;
-    private ToggleButton toggleBewegung;
-
-    //Überprüfungswerte
-    boolean wahr;
-    private void log(String nachricht) {
-        Log.d(this.getClass().getSimpleName(), nachricht);
-    }
 
     @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);
-        toggleKamera.setOnClickListener(this);
-        toggleAudio = findViewById(R.id.toggleAudio);
-        toggleAudio.setOnClickListener(this);
-        toggleBewegung = findViewById(R.id.toggleBewegung);
-        toggleBewegung.setOnClickListener(this);
 
+        TextView textView = findViewById(R.id.textView);
+        VideoView videoView = findViewById(R.id.videoView);
+        PreviewView previewView = findViewById(R.id.previewView);
+
+        File directory = getFilesDir();
+
+
+        AudioRecorder ar = new AudioRecorder(this);
+
+
+        //DetectionRecorder detectionRecorder = new DetectionRecorder(this);
+        //detectionRecorder.setPreviewView(previewView);
+
+        ToggleButton toggleButton = findViewById(R.id.previewButton);
+        ToggleButton toggleButton2 = findViewById(R.id.toggleButton2);
+
+        toggleButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getRecordVideoAccess();
+                File[] files = directory.listFiles();
+                textView.setText(Arrays.toString(files));
+
+                if (isRecordVideoAllowed() && toggleButton.isChecked())
+                {
+                    ar.startRecording();
+                    //vd.startRecording();
+                    //vd.playVideo(videoView);
+                    //detectionRecorder.playVideo(videoView);
+                    //detectionRecorder.start();
+                }
+                else {
+                    ar.stopRecording();
+                    //vd.stopRecording();
+
+                    //detectionRecorder.stop();
+                }
+            }
+        });
+
+        toggleButton2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (toggleButton.isChecked())
+                {
+                    ar.playAudio();
+                }
+                else {
+                    ar.deleteRecording();
+                }
+            }
+        });
     }
-    @Override
-    public void onClick(View v) {
-        if (v == toggleKamera) {
-            if (toggleKamera.isChecked()) {
-                wahr = true;
-            } else {
-                wahr = false;
-            }
-        }
-        if (v == toggleAudio) {
-            if (toggleAudio.isChecked()) {
-                wahr = true;
-            } else {
-                wahr = false;
-            }
-        }
-        if (v == toggleBewegung) {
-            if (toggleBewegung.isChecked()) {
-                wahr = true;
-            } else {
-                wahr = false;
-            }
+
+    private boolean isRecordVideoAllowed() {
+        return ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED &&
+                ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void getRecordVideoAccess() {
+        if (!isRecordVideoAllowed()) {
+            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO}, PERMISSION_REQUEST_CODE);
         }
     }
-    @Override
-    protected void onPause() {
-        super.onPause();
-        communication.stopCommunication();
-    }
+
 
     @Override
-    protected void onResume() {
-        super.onResume();
-        communication = new WifiCommunication(1234);
-    }
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 
-    public void onClickZeigeFragment1(View view) {
-        Button button = (Button) view;
-        log(button.getText() + " ausgewählt");
-        zeigeFragment(fragment1.erstellen("Hier stehen dann die Alarme"));
-    }
+        if (requestCode == PERMISSION_REQUEST_CODE && grantResults.length > 0) {
 
-    public void onClickZeigeFragment2(View view) {
-        Button button = (Button) view;
-        log(button.getText() + " ausgewählt");
-        zeigeFragment(fragment2.erstellen("Hier stehen dann die Videos"));
-    }
+            boolean cameraRights = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+            boolean recordAudioRights = grantResults[1] == PackageManager.PERMISSION_GRANTED;
 
-    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 ;
+            if (cameraRights && recordAudioRights) {
+                Toast.makeText(this, "permissions granted", Toast.LENGTH_LONG).show();
+            } else {
+                Toast.makeText(this, "permissions denied", Toast.LENGTH_LONG).show();
+            }
         }
     }
 }

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

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

@@ -1,43 +0,0 @@
-package com.example.ueberwachungssystem;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.widget.Toast;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-public class PermissionHandler {
-    private final Context context;
-    private static final int PERMISSION_REQUEST_CODE = 23409;
-    private static final String[] permissions = new String[]{
-            android.Manifest.permission.CAMERA,
-            android.Manifest.permission.RECORD_AUDIO
-    };
-
-    public PermissionHandler(Context context) {
-        this.context = context;
-    }
-
-    public boolean hasPermissions() {
-        boolean permissionState = true;
-        for (String permission: permissions) {
-            permissionState = permissionState && ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED;
-        }
-        return permissionState;
-    }
-
-    public void getPermissions() {
-        if (!hasPermissions())
-            ActivityCompat.requestPermissions((Activity) context, permissions, PERMISSION_REQUEST_CODE);
-    }
-
-    public void showPermissionToast() {
-        if (hasPermissions())
-            Toast.makeText(context, "permissions available", Toast.LENGTH_SHORT).show();
-        else
-            Toast.makeText(context, "permissions missing", Toast.LENGTH_SHORT).show();
-    }
-}

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

@@ -1,48 +0,0 @@
-package com.example.ueberwachungssystem;
-
-import static android.Manifest.permission.INTERNET;
-import static android.Manifest.permission.CAMERA;
-import static android.Manifest.permission.RECORD_AUDIO;
-
-import android.content.pm.PackageManager;
-import android.os.Handler;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-
-public class PermissionRequest extends AppCompatActivity{
-    private static final int PERMISSION_REQUEST_CODE = 123;
-    private final MainActivity mainActivity;
-
-    Handler handler = new Handler();
-
-    public PermissionRequest(MainActivity mainActivity) {
-        this.mainActivity = mainActivity;
-    }
-
-    public StringBuilder rechtePruefen() {
-        boolean rechtKamera = ContextCompat.checkSelfPermission(mainActivity, CAMERA) == PackageManager.PERMISSION_GRANTED;
-        boolean rechtMikrofon = ContextCompat.checkSelfPermission(mainActivity, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
-        boolean rechtInternet = ContextCompat.checkSelfPermission(mainActivity, INTERNET) == PackageManager.PERMISSION_GRANTED;
-        StringBuilder sb = new StringBuilder();
-        sb.append("Rechte prüfen:")
-                .append("\nKamera: ").append(rechtKamera)
-                .append("\nMikrofon: ").append(rechtMikrofon)
-                .append("\nInternet: ").append(rechtInternet);
-        //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(sb));
-        if (!(rechtKamera && rechtMikrofon && rechtInternet)){
-            handler.post(new Runnable() {
-                @Override
-                public void run() {
-                    Toast.makeText(mainActivity.getApplicationContext(),"Es werden Rechte benötigt", Toast.LENGTH_LONG).show();
-                }
-            });
-        }
-        return sb;
-    }
-
-    public void rechteAnfordern() {
-        mainActivity.requestPermissions(new String[]{CAMERA, RECORD_AUDIO, INTERNET}, PERMISSION_REQUEST_CODE);
-    }
-}

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

@@ -1,86 +0,0 @@
-package com.example.ueberwachungssystem;
-
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.PopupWindow;
-import android.widget.TextView;
-
-public class PopUpClass {
-    private final MainActivity mainActivity;
-
-    PermissionRequest permission;
-    TextView PopUpText;
-
-
-    public PopUpClass(MainActivity mainActivity) {
-        this.mainActivity = mainActivity;
-        permission = new PermissionRequest(mainActivity);
-    }
-
-    //PopupWindow display method
-
-    public void showPopupWindow(final View view) {
-
-
-        //Create a View object yourself through inflater
-        LayoutInflater inflater = (LayoutInflater) view.getContext().getSystemService(view.getContext().LAYOUT_INFLATER_SERVICE);
-        View popupView = inflater.inflate(R.layout.popup_window, null);
-
-        //Specify the length and width through constants
-        int width = LinearLayout.LayoutParams.WRAP_CONTENT;
-        int height = LinearLayout.LayoutParams.WRAP_CONTENT;
-
-        //Make Inactive Items Outside Of PopupWindow
-        boolean focusable = true;
-
-        //Create a window with our parameters
-        final PopupWindow popupWindow = new PopupWindow(popupView,width*1, height*1, focusable);
-
-        //Set the location of the window on the screen
-        popupWindow.showAtLocation(view, Gravity.CENTER, 0, 0);
-
-        //Initialize the elements of our window, install the handler
-
-        PopUpText = popupView.findViewById(R.id.titleText);
-
-        Button buttonEdit = popupView.findViewById(R.id.RechteAnfordern);
-        buttonEdit.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                RechteAnfordern();
-            }
-        });
-
-        //Handler for clicking on the inactive zone of the window
-
-        popupView.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-
-                //Close the window when clicked
-                popupWindow.dismiss();
-                return true;
-            }
-        });
-    }
-    public void RechtePrüfen(){
-        StringBuilder Text = permission.rechtePruefen();
-        PopUpText.setText(Text);
-    }
-    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");
-    }
-    public void Impressum(){
-        PopUpText.setText("Die Ueberwachungsapp wurde im Rahmen eines Praktikums der TH-Nürnberg programmiert");
-    }
-
-}

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

@@ -1,36 +0,0 @@
-package com.example.ueberwachungssystem;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.io.File;
-import java.util.List;
-
-public class VideoListAdapter extends ArrayAdapter<File> {
-
-    public VideoListAdapter(Context context, List<File> videoList) {
-        super(context, 0, videoList);
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        if (convertView == null) {
-            convertView = LayoutInflater.from(getContext()).inflate(R.layout.list_item_video, parent, false);
-        }
-
-        File videoFile = getItem(position);
-
-        ImageView thumbnailImageView = convertView.findViewById(R.id.imageViewThumbnail);
-        TextView titleTextView = convertView.findViewById(R.id.textViewTitle);
-
-        // Set tag to identify the clicked item
-        convertView.setTag(videoFile.getAbsolutePath());
-
-        return convertView;
-    }
-}

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

@@ -1,141 +0,0 @@
-package com.example.ueberwachungssystem;
-import android.annotation.SuppressLint;
-
-import androidx.annotation.NonNull;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Enumeration;
-
-public class WifiCommunication {
-    //private final MainActivity mainActivity;
-    private final InetAddress address;
-    private final int port;
-
-    private String messageToSend;
-    volatile private boolean send;
-    private final DatagramSocket socket;
-    volatile private boolean running;
-
-    private OnConnectionListener listener;
-    @SuppressLint("SetTextI18n")
-    public WifiCommunication(int port) {
-        //this.mainActivity = mainActivity;
-        this.port = port;
-        try {
-            socket = new DatagramSocket(this.port);
-            socket.setBroadcast(true);
-            address = InetAddress.getByName("255.255.255.255"); //100.82.255.255
-            running = true;
-            send = false;
-            new ReceiveThread().start();
-            new SendThread().start();
-        } catch (SocketException | UnknownHostException e) {
-            throw new RuntimeException(e);
-        }
-        //Toast.makeText(mainActivity.getApplicationContext(),"Communication running", Toast.LENGTH_SHORT).show();
-        //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText("Communication running"));
-    }
-
-    public interface OnConnectionListener {
-        void onConnection(StringBuffer data);
-    }
-    public void setOnConnectionListener(@NonNull OnConnectionListener listener) {
-        this.listener = listener;
-    }
-
-    public void sendWifiData(StringBuffer wifiMessage) {
-        if (listener != null) {
-            listener.onConnection(wifiMessage);
-        }
-    }
-
-    private class ReceiveThread extends Thread {
-        private StringBuffer rxStringBuffer = new StringBuffer();
-        private String rxString="";
-        private String previousRxString = "";
-
-        @Override
-        public void run() {
-            try {
-                do {
-                    byte[] receiveData = new byte[512];
-                    DatagramPacket rxPacket = new DatagramPacket(receiveData, receiveData.length);
-                    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) {
-                        rxStringBuffer.append(rxString).append("\n");
-                        sendWifiData(rxStringBuffer);
-                        //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
-                        previousRxString = rxString;
-                    }
-                } while (running);
-            }
-            catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    private class SendThread extends Thread {
-        private int tmpCnt = 0;
-        @Override
-        public void run() {
-            try {
-                do {
-                    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);
-                        send_Data = txString.getBytes();
-
-                        DatagramPacket txPacket = new DatagramPacket(send_Data, txString.length(), address, port);
-
-                        for(int i = 0; i < 300; i++) {
-                            socket.send(txPacket);
-                        }
-                    }
-                } while (running);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    public static String getLocalIpAddress() {
-        try {
-            for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
-                NetworkInterface networkInterface = (NetworkInterface) ((Enumeration<?>) en).nextElement();
-                for (Enumeration<InetAddress> addresses = networkInterface.getInetAddresses(); addresses.hasMoreElements();) {
-                    InetAddress inetAddress = addresses.nextElement();
-                    if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
-                        return inetAddress.getHostAddress();
-                    }
-                }
-            }
-        } catch (SocketException ex) {
-            ex.printStackTrace();
-        }
-        return null;
-    }
-
-    public void sendTrue(String message){
-        send = true;
-        messageToSend = message;
-    }
-    public void stopCommunication() {
-        running = false;
-        socket.close();
-    }
-}

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

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

app/src/main/res/layout-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,129 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#010C49"
-    android:visibility="visible"
-    tools:context="com.example.ueberwachungssystem.MainActivity"
-    tools:visibility="visible">
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="vertical"
+    tools:context=".MainActivity">
 
     <TextView
-        android:id="@+id/textAuswahl"
-        android:layout_width="match_parent"
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
-        android:textSize="20sp"
-        android:textColor="@color/white"/>
+        android:text=""
+        android:textSize="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/textAoderA"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/toggleAudio"
-        android:layout_alignParentLeft="true"
-        android:layout_marginTop="15dp"
-        android:textSize="20sp"
-        android:textColor="@color/white"/>
 
     <ToggleButton
-        android:id="@+id/toggleKamera"
-        android:layout_width="wrap_content"
+        android:id="@+id/previewButton"
+        android:layout_width="match_parent"
         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"/>
+        android:text="ToggleButton" />
+
 
     <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:id="@+id/toggleButton2"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/btnAufnahmen"
-        android:layout_marginTop="25dp"
-        android:layout_alignParentStart="true"
-        android:background="@color/white">
-    </FrameLayout>
+        android:layout_height="wrap_content"
+        android:text="ToggleButton" />
 
-    <!--
-    <ScrollView
-        android:id="@+id/scrollView1"
+    <androidx.camera.view.PreviewView
+        android:id="@+id/previewView"
         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"
-                android:background="@color/red"/>
-        </LinearLayout>
-    </ScrollView>
-    -->
+        android:layout_height="200dp" />
 
-</RelativeLayout>
+    <VideoView
+        android:id="@+id/videoView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+
+</LinearLayout>

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

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:background="@color/bluedark">
-
-    <ScrollView
-        android:id="@+id/scrollView1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="25dp">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-            <TextView
-                android:id="@+id/Alarm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/yellow"/>
-        </LinearLayout>
-    </ScrollView>
-
-</RelativeLayout>

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

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:background="@android:color/holo_blue_light" >
-
-    <ScrollView
-        android:id="@+id/scrollView2"
-        android:layout_width="match_parent"
-        android:layout_height="250dp"
-        android:layout_marginTop="25dp">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-            <TextView
-                android:id="@+id/Aufzeichnungen"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textColor="@color/yellow"/>
-        </LinearLayout>
-    </ScrollView>
-
-    <VideoView
-        android:id="@+id/AusAuf"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/scrollView2"
-        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-</LinearLayout>

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

@@ -1,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/layout/popup_window.xml

@@ -1,29 +0,0 @@
-<?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"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:gravity="center"
-    android:background="#A5ACB2">
-
-    <TextView
-        android:id="@+id/titleText"
-        android:layout_gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="20sp"
-        android:textStyle="italic"
-        android:padding="10dp"/>
-
-    <Button
-        android:id="@+id/RechteAnfordern"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:text="Rechte Anfordern" />
-
-
-
-</LinearLayout>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/Rechteverwaltung"
-        android:title="Rechteverwaltung" />
-    <item android:id="@+id/Sensoren"
-        android:title="Sensoren" />
-    <item android:id="@+id/Impressum"
-        android:title="Impressum" />
-</menu>

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

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

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

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

build.gradle

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.0' apply false
-    id 'com.android.library' version '8.0.0' apply false
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
 }

gradle.properties

@@ -18,6 +18,4 @@ android.useAndroidX=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
+android.nonTransitiveRClass=true

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -14,4 +14,3 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Ueberwachungssystem"
 include ':app'
-include ':app'