Kamera Preview ergänzt

app/src/main/AndroidManifest.xml

@@ -4,9 +4,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-
 
     <uses-feature android:name="android.hardware.camera"/>
 
@@ -32,6 +29,9 @@
         <activity
             android:name=".AccelerometerActivity"
             android:exported="false" />
+        <activity
+            android:name=".VideoPreviewActivity"
+            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true">

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

@@ -1,23 +1,16 @@
 package com.example.greenwatch;
 
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
-import android.Manifest;
 
 import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
 import com.example.greenwatch.adapters.DeviceListAdapter;
@@ -34,10 +27,9 @@ public class MainActivity extends AppCompatActivity {
     private Button audiodetectionAndAccelerometerButton;
     private Button videodetectionAndAccelerometerButton;
     private Button connectionButton;
+    private Button prewview_kamera;
     private MainActivityViewModel mMainActivityViewModel;
 
-    private static final int REQUEST_PERMISSION_INTERNET = 123;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -49,6 +41,7 @@ public class MainActivity extends AppCompatActivity {
         audiodetectionAndAccelerometerButton = (Button) findViewById(R.id.audiodetectionAndAccelerometerButton);
         videodetectionAndAccelerometerButton = (Button) findViewById(R.id.videodetectionAndAccelerometerButton);
         connectionButton = (Button) findViewById(R.id.connectionButton);
+        prewview_kamera = (Button) findViewById(R.id.preview_kamera);
 
         RecyclerView deviceListRecyclerView = findViewById(R.id.deviceListRecyclerView);
         deviceListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
@@ -93,6 +86,17 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
+        prewview_kamera.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mMainActivityViewModel.isCameraAccessAllowed(MainActivity.this)) {
+                    openVideoPrewvoewActivity();
+                }
+                else {
+                    mMainActivityViewModel.accessRequestCamera(MainActivity.this);
+                }
+            }
+        });
         audiodetectionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -136,17 +140,14 @@ public class MainActivity extends AppCompatActivity {
         connectionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if(ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.INTERNET) != PackageManager.PERMISSION_GRANTED
+                openConnectionActivity();
-                        || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.ACCESS_WIFI_STATE) != PackageManager.PERMISSION_GRANTED
-                        || ContextCompat.checkSelfPermission(MainActivity.this, Manifest.permission.CHANGE_WIFI_MULTICAST_STATE) != PackageManager.PERMISSION_GRANTED) {
-
-                    ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.INTERNET, Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.CHANGE_WIFI_MULTICAST_STATE}, REQUEST_PERMISSION_INTERNET);
-                } else {
-                    openConnectionActivity();
-                }
             }
         });
     }
+    public void openVideoPrewvoewActivity() {
+        Intent intent = new Intent(this, VideoPreviewActivity.class);
+        startActivity(intent);
+    }
     public void openAudiodetectionActivity(){
         Intent intent = new Intent(this, AudiodetectionActivity.class);
         startActivity(intent);
@@ -173,20 +174,4 @@ public class MainActivity extends AppCompatActivity {
         mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51",  true, "Audio", 10);
     }
 
-    @Override
-    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_PERMISSION_INTERNET) {
-            if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                // Berechtigungen wurden gewährt
-                Toast.makeText(this, "Berechtigungen gewährt", Toast.LENGTH_SHORT).show();
-                openConnectionActivity();
-            } else {
-                // Berechtigungen wurden nicht gewährt
-                Toast.makeText(this, "Berechtigungen nicht gewährt", Toast.LENGTH_SHORT).show();
-            }
-        }
-    }
-
-
 }

app/src/main/java/com/example/greenwatch/VideoPreviewActivity.java

@@ -0,0 +1,61 @@
+package com.example.greenwatch;
+
+import android.os.Bundle;
+import android.util.Size;
+import android.widget.Button;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.core.ImageProxy;
+import androidx.camera.core.Preview;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.camera.view.PreviewView;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.concurrent.ExecutionException;
+
+public class VideoPreviewActivity extends AppCompatActivity {
+
+    private Button backToMainActivity;
+    private PreviewView previewView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_preview_kamera);
+
+        backToMainActivity = (Button) findViewById(R.id.videodetectorBackToMainActivity);
+        previewView = findViewById(R.id.previewView);
+
+        backToMainActivity.setOnClickListener(v -> finish());
+
+
+        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(this);
+        cameraProviderFuture.addListener(() -> {
+            try {
+                bindImageAnalysis(cameraProviderFuture.get());
+            } catch (ExecutionException | InterruptedException e) {
+                e.printStackTrace();
+            }
+        }, ContextCompat.getMainExecutor(this));
+    }
+
+    private void bindImageAnalysis(ProcessCameraProvider cameraProvider) {
+        ImageAnalysis.Builder builder = new ImageAnalysis.Builder();
+        builder.setTargetResolution(new Size(640, 480));
+        builder.setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST);
+        ImageAnalysis imageAnalysis = builder.build();
+        imageAnalysis.setAnalyzer(
+                ContextCompat.getMainExecutor(this),
+                ImageProxy::close);
+
+        Preview preview = new Preview.Builder().build();
+        CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
+        preview.setSurfaceProvider(previewView.getSurfaceProvider());
+        cameraProvider.bindToLifecycle((LifecycleOwner) this, cameraSelector, imageAnalysis, preview);
+    }
+}

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

@@ -8,6 +8,12 @@
     android:padding="10dp"
     tools:context=".MainActivity">
 
+    <Button
+        android:id="@+id/preview_kamera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="PrewView Kamera" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/alarmHistoryListRecyclerView"
         android:layout_width="match_parent"
@@ -22,6 +28,7 @@
         android:layout_height="match_parent"
         android:layout_weight="3"
         tools:listitem="@layout/device_item">
+
     </androidx.recyclerview.widget.RecyclerView>
     
     <LinearLayout

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

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    tools:context="">
+
+    <Button
+        android:id="@+id/videodetectorBackToMainActivity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Back to MainActivity">
+    </Button>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/erklaerung">
+
+        <androidx.camera.view.PreviewView
+            android:id="@+id/previewView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </FrameLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>