From 8cc57ec4d533d6486f4dc9d8e96a3600eb5ead6e Mon Sep 17 00:00:00 2001
From: Bastian Kohler <kohlerba68671@th-nuernberg.de>
Date: Mon, 29 May 2023 18:28:44 +0200
Subject: [PATCH] Refactor

---
 app/src/main/AndroidManifest.xml                         | 5 ++++-
 .../com/example/ueberwachungssystem/MainActivity.java    | 9 ++++++---
 .../VideoDetection/VideoDetector.java                    | 1 +
 app/src/main/res/layout/activity_main.xml                | 4 +++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 36b1460..c680b58 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,10 @@
     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.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-feature android:name="android.hardware.Camera"/>
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
index 1173b49..96da54c 100644
--- a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
+++ b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
@@ -10,17 +10,20 @@ 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.TextView;
 import android.widget.Toast;
 import android.widget.ToggleButton;
+import android.widget.VideoView;
 
 import com.example.ueberwachungssystem.VideoDetection.VideoDetector;
 
 @ExperimentalGetImage
 public class MainActivity extends AppCompatActivity {
 
-    private static final int CAMERA_PERMISSION_REQUEST_CODE = 101;
+    private static final int CAMERA_PERMISSION_REQUEST_CODE = 100;
+    private static final int RECORD_VIDEO_PERMISSION_REQUEST_CODE = 102;
 
 
     @Override
@@ -77,9 +80,9 @@ public class MainActivity extends AppCompatActivity {
         if (requestCode == CAMERA_PERMISSION_REQUEST_CODE && grantResults.length > 0) {
             boolean cameraRights = grantResults[0] == PackageManager.PERMISSION_GRANTED;
             if (cameraRights) {
-                Toast.makeText(this, "camera permission granted", Toast.LENGTH_LONG).show();
+                Toast.makeText(this, "permission granted", Toast.LENGTH_LONG).show();
             } else {
-                Toast.makeText(this, "camera permission denied", Toast.LENGTH_LONG).show();
+                Toast.makeText(this, "permission denied", Toast.LENGTH_LONG).show();
             }
         }
     }
diff --git a/app/src/main/java/com/example/ueberwachungssystem/VideoDetection/VideoDetector.java b/app/src/main/java/com/example/ueberwachungssystem/VideoDetection/VideoDetector.java
index babb677..08ae209 100644
--- a/app/src/main/java/com/example/ueberwachungssystem/VideoDetection/VideoDetector.java
+++ b/app/src/main/java/com/example/ueberwachungssystem/VideoDetection/VideoDetector.java
@@ -117,6 +117,7 @@ public class VideoDetector extends Detector {
         if (previewView != null)
             preview.setSurfaceProvider(previewView.getSurfaceProvider());
 
+        cameraProvider.unbindAll();
         cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview);
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 275c453..ad76417 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -32,6 +32,8 @@
         android:id="@+id/previewView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:backgroundTint="@android:color/black"/>
+        android:backgroundTint="@android:color/black">
+
+    </androidx.camera.view.PreviewView>
 
 </LinearLayout>
\ No newline at end of file