Timer für Fehlalare verbessert

Durch clustern der Pixel eventuell bessere Detektion realisiert

app/build.gradle

@@ -25,6 +25,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    namespace 'com.example.greenwatch'
 }
 
 dependencies {
@@ -35,4 +36,10 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    def camerax_version = "1.2.3"
+    implementation "androidx.camera:camera-camera2:${camerax_version}"
+    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
+    implementation "androidx.camera:camera-view:${camerax_version}"
+
 }

app/src/main/AndroidManifest.xml

@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="com.example.greenwatch">
+
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-feature android:name="android.hardware.camera"/>
 
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -10,9 +18,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.GreenWatch">
-        <activity
-            android:name=".Mikrofon"
-            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true">
@@ -22,6 +27,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".KameraAktivitaet" />
+        <activity android:name=".Kamera_Beschleunigungssensor" />
+
     </application>
 
 </manifest>

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

@@ -1,23 +0,0 @@
-package com.example.greenwatch;
-
-public class GleitenderMittelwert {
-    private final float wichtungNeuerWert;
-    private final float wichtungAlterWert;
-    private float mittelwert = 0;
-
-    private boolean istMittelwertGesetzt = false;
-
-    GleitenderMittelwert(float wichtungNeuerWert) {
-        this.wichtungNeuerWert = wichtungNeuerWert;
-        this.wichtungAlterWert = 1 - this.wichtungNeuerWert;
-    }
-
-    float mittel(float wert) {
-        if (istMittelwertGesetzt) {
-            mittelwert = wert * wichtungNeuerWert + mittelwert * wichtungAlterWert;
-        } else {
-            mittelwert = wert;
-            istMittelwertGesetzt = true;
-        }
-        return mittelwert;
-}}

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

@@ -1,4 +0,0 @@
-package com.example.greenwatch;
-
-public class Kamera {
-}

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

@@ -0,0 +1,205 @@
+package com.example.greenwatch;
+
+import android.graphics.ImageFormat;
+import android.media.Image;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Size;
+
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+// PREVIEW
+//import androidx.camera.view.PreviewView;
+import androidx.core.content.ContextCompat;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.ExecutionException;
+
+public class KameraAktivitaet extends AppCompatActivity {
+
+    // PREVIEW
+    // private PreviewView previewView;
+    private boolean isMotionDetected;
+    private boolean camera_alarm = false;
+    private TextView alarm;
+
+    // Bildverarbeitung Variablen
+    private ByteBuffer previousBuffer;
+    private int previousWidth;
+    private int previousHeight;
+    private final int threshold = 50;
+    private int startX;
+    private int startY;
+    private int endX;
+    private int endY;
+
+    private static final long ALARM_RESET_DELAY = 5000;
+    private Runnable alarmResetRunnable;
+    private final Handler alarmResetHandler = new Handler();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        // NUR FÜR TESTS
+        alarm = findViewById(R.id.textView);
+
+        // previewView = findViewById(R.id.previewView);
+
+        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 -> {
+
+                    int imageFormat = imageProxy.getFormat();
+
+                    if (imageFormat == ImageFormat.YUV_420_888) {
+
+                        Image currentImage = imageProxy.getImage();
+
+                        if (previousHeight != 0) {
+                            assert currentImage != null;
+                            isMotionDetected = compareFrames(currentImage);
+                        }
+
+                        assert currentImage != null;
+                        Image.Plane[] planes = currentImage.getPlanes();
+                        ByteBuffer buffer = planes[0].getBuffer().duplicate();
+                        previousBuffer = ByteBuffer.allocateDirect(buffer.remaining());
+                        previousBuffer.put(buffer);
+                        previousWidth = currentImage.getWidth();
+                        previousHeight = currentImage.getHeight();
+
+                        currentImage.close();
+
+                        if (isMotionDetected) {
+
+                            alarm.setText("ALARM");
+                            camera_alarm = true;
+
+                            if(alarmResetRunnable != null) {
+                                alarmResetHandler.removeCallbacks(alarmResetRunnable);
+                            }
+
+                            alarmResetRunnable = this::resetAlarmStatus;
+                            alarmResetHandler.postDelayed(alarmResetRunnable, ALARM_RESET_DELAY);
+                        }
+                    }
+
+                    imageProxy.close();
+                });
+
+        // Preview preview = new Preview.Builder().build();
+
+        CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
+
+        // PREVIEW //
+        // preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        cameraProvider.bindToLifecycle(this, cameraSelector, imageAnalysis);
+
+    }
+
+    // Bildverarbeitung zur Bewegungserkennung
+    private boolean compareFrames(Image currentImage) {
+        Image.Plane[] planes = currentImage.getPlanes();
+        ByteBuffer currentBuffer = planes[0].getBuffer();
+        int currentWidth = currentImage.getWidth();
+        int currentHeight = currentImage.getHeight();
+        int yRowStride = planes[0].getRowStride();
+        int yPixelStride = planes[0].getPixelStride();
+
+
+        //System.out.println("Höhe: " + currentHeight + "   Breite: " + currentWidth);
+
+        if (previousWidth != currentWidth || previousHeight != currentHeight) {
+            return false;
+        }
+
+        // Blöcke weiter verkleinern
+        int blockSize = kleinstesQuadrat(previousHeight, previousWidth) / 8;
+
+        //System.out.println(blockSize);
+
+        int numBlocksX = currentWidth / blockSize;
+        int numBlocksY = currentHeight / blockSize;
+
+        for (int blockY = 0; blockY < numBlocksY; blockY++) {
+            for (int blockX = 0; blockX < numBlocksX; blockX++) {
+                startX = blockX * blockSize;
+                startY = blockY * blockSize;
+                endX = startX + blockSize;
+                endY = startY + blockSize;
+
+                float currentLuminance = berechneMittlereLuminanz(currentBuffer, yRowStride, yPixelStride);
+                float previousLuminance = berechneMittlereLuminanz(previousBuffer, yRowStride, yPixelStride);
+
+                int pixelDifference = Math.abs((int) previousLuminance - (int) currentLuminance);
+
+                //System.out.println(pixelDifference);
+
+                if (pixelDifference > threshold) {
+                    System.out.println(pixelDifference);
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private float berechneMittlereLuminanz(ByteBuffer buffer, int rowStride, int pixelStride) {
+        int sumLuminance = 0;
+        int countPixels = 0;
+
+        for (int row = startY; row < endY; row++) {
+            for (int col = startX; col < endX; col++) {
+                int bufferIndex = row * rowStride + col * pixelStride;
+                int currentPixel = buffer.get(bufferIndex) & 0xFF;
+
+                sumLuminance += currentPixel;
+                countPixels++;
+            }
+        }
+
+        return (float) sumLuminance / countPixels;
+    }
+
+    private int kleinstesQuadrat(int height, int width) {
+        if (height == width) {
+            return height;
+        } else if (height > width) {
+            return kleinstesQuadrat(height - width, width);
+        } else {
+            return kleinstesQuadrat(height, width - height);
+        }
+    }
+
+    private void resetAlarmStatus() {
+        camera_alarm = false;
+        alarm.setText("OK");
+        alarmResetRunnable = null;
+    }
+}
+

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

@@ -0,0 +1,320 @@
+package com.example.greenwatch;
+
+import android.graphics.ImageFormat;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.media.Image;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.util.Size;
+
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageAnalysis;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+// PREVIEW
+//import androidx.camera.view.PreviewView;
+import androidx.core.content.ContextCompat;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.nio.ByteBuffer;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+
+public class Kamera_Beschleunigungssensor extends AppCompatActivity implements SensorEventListener {
+
+    private HandlerThread cameraThread;
+    private Handler cameraHandler;
+    // PREVIEW
+    // private PreviewView previewView;
+    private boolean isMotionDetected;
+    private boolean camera_alarm;
+    private TextView alarm;
+    private ByteBuffer previousBuffer;
+    private int previousWidth;
+    private int previousHeight;
+
+    /////////////////////////////////////
+
+    private SensorManager bsmanager;
+    private ArrayList<Float> Gesamt_be;
+    private int sensorType = Sensor.TYPE_GYROSCOPE, zaehler_runde =0, listen_groesse = 500, kalibrieren, Offset_shared = 0, shared_merk, mittelwertsumme_shared;
+    private Sensor sens, sensor_l;
+    private float x_value = 0, y_value, z_value, Vorbesetzung = 0, gesamt_runde =0;
+    private double Schwellwert = 0.15, mittelwertsumme = 0.0, Offset = 0.1;
+    String Daten, Warnung, Zeitstempel, Array_shared;
+    private final static String KEY_kalibirieren = "KEY_KALIBRIEREN_"+Beschleunigungssensor.class.getSimpleName();
+    private final static String KEY_Gesamt_be = "KEY_GESAMT_BE_"+Beschleunigungssensor.class.getSimpleName();
+    private final static String KEY_Offset = "KEY_OFFSET_"+Beschleunigungssensor.class.getSimpleName();
+    private final static String KEY_Mittelwertsumme = "KEY_MITTELWERTSUMME_"+Beschleunigungssensor.class.getSimpleName();
+    TextView Daten_Bsensor, Warnung_Bsensor, test;
+    private boolean toggle = true, ts_setzen = true, start_messen;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_beschleunigung_kamera);
+        ////////
+        Daten_Bsensor = (TextView) findViewById(R.id.DatenBsensor);
+        Warnung_Bsensor = (TextView) findViewById(R.id.WarnungBsensor);
+        test = (TextView) findViewById(R.id.test);
+
+        bsmanager = (SensorManager) getSystemService(SENSOR_SERVICE);
+        if (bsmanager.getSensorList(Sensor.TYPE_GYROSCOPE).size() == 0) {
+            sens = null;
+            Daten = "kein B Sensor voranden";
+        } else {
+            sens = bsmanager.getSensorList(sensorType).get(0);
+        }
+        Gesamt_be = new ArrayList<Float>();
+        for (int i = 0; i < listen_groesse ; i++){
+            Gesamt_be.add(Vorbesetzung);
+        }
+        kalibrieren = 0;
+        start_messen = false;
+
+        ///////
+        // NUR FÜR TESTS
+        alarm = findViewById(R.id.Alarm_Kamera);
+
+        // PREVIEW //
+        // previewView = findViewById(R.id.previewView);
+
+        final ListenableFuture<ProcessCameraProvider> cameraProviderFuture = ProcessCameraProvider.getInstance(this);
+        cameraProviderFuture.addListener(() -> {
+            try {
+                bindImageAnalysis(cameraProviderFuture.get());
+            } catch (ExecutionException | InterruptedException e) {
+                e.printStackTrace();
+            }
+        }, ContextCompat.getMainExecutor(this));
+    }
+
+    public static String getTimestamp(){
+        Long tslong = System.currentTimeMillis();
+        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+        Date date = new Date(tslong);
+        String result = sdf.format(date);
+
+        return result;
+    }
+
+    @Override
+    public void onSensorChanged(SensorEvent event) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("x=").append(event.values[0])//.append(event.timestamp)
+                .append("\ny=").append(event.values[1])
+                .append("\nz=").append(event.values[2]);
+        Daten = sb.toString();
+        Daten_Bsensor.setText(Daten);
+        gesamt_runde = event.values[0] + event.values[1] + event.values[2];
+        Gesamt_be.remove(zaehler_runde);
+        Gesamt_be.add(zaehler_runde, gesamt_runde);
+        mittelwertsumme = 0.0;
+
+        //Mittelwert des Arrays berechnen
+        for (int i = 0; i < listen_groesse; i++){
+            if (Gesamt_be.get(i) < 0){
+                mittelwertsumme += (Gesamt_be.get(i) * (-1));
+            }else {
+                mittelwertsumme += Gesamt_be.get(i);
+            }
+        }
+        mittelwertsumme = mittelwertsumme/listen_groesse;
+        if (kalibrieren < listen_groesse){
+            Offset = mittelwertsumme;
+            kalibrieren++;
+        }else {
+            start_messen = true;
+        }
+        StringBuilder testsb = new StringBuilder();
+        testsb.append(mittelwertsumme);
+        String tests = testsb.toString();
+        test.setText(tests);
+
+        if((mittelwertsumme > (Schwellwert+Offset) ) & (ts_setzen == true) &(start_messen == true)){
+            Zeitstempel = getTimestamp();
+            StringBuilder ts = new StringBuilder();
+            ts.append(Zeitstempel)
+                    .append(", Gruppe3")
+                    .append(", An")
+                    .append(", Bewegung, ")
+                    .append(mittelwertsumme);
+            Warnung = ts.toString();
+            Warnung_Bsensor.setText(Warnung);
+            ts_setzen = false;
+        }else if((mittelwertsumme > (Schwellwert+Offset)) & (ts_setzen == false)){
+        } else if ((mittelwertsumme < (Schwellwert+Offset)) & (ts_setzen == false)) {
+            Warnung_Bsensor.setText("");
+            ts_setzen = true;
+        }
+
+        if (zaehler_runde < (listen_groesse -1)){
+            zaehler_runde++;
+        }else {
+            zaehler_runde = 0;
+        }
+    }
+    //mittelwertsumme ist kein int in diesem programm
+    //shared prefenrences: bei Kippen speichern -> nochmal neu klalibrieren? -> eig ja, weil neuer Standort
+    //Vorbelegung nicht nochmal neu vornehmen -> aus onCreate Funktion raus -> hilfsvariablen auch in shared preferences speichern
+    @Override
+    public void onAccuracyChanged(Sensor sensor, int accuracy) {}
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (sens != null) {
+            if (bsmanager.registerListener(this, sens, SensorManager.SENSOR_DELAY_GAME)) {
+                Daten = "Wir haben uns beim Sensor angemeldet";
+            } else {
+                Daten = "Das anmelden hat nicht geklappt";
+            }
+        }
+        //SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
+        //mittelwertsumme_shared = p.getInt(KEY_Mittelwertsumme, 0);
+        //kalibrieren = p.getInt(KEY_kalibirieren, 0);
+        //Offset_shared = p.getInt(KEY_Offset, 0 );
+        //Array_shared = p.getString(KEY_Gesamt_be, "");
+
+        //mittelwertsumme = (double) mittelwertsumme_shared;
+        //mittelwertsumme /= 1000000.0;
+
+        //Offset = (double) Offset_shared;
+        //Offset /= 1000000.0;
+
+        //String zw[] = Array_shared.split(";", listen_groesse);
+
+        //if(shared_merk == 2){
+        //for (int i=0; i<listen_groesse; i++){
+        //float wert = Float.valueOf(zw[i]);
+        //Gesamt_be.add(i, wert);
+        //}}
+
+    }
+
+
+    @Override
+    protected void onPause () {
+        super.onPause();
+        if (sens != null) {
+            bsmanager.unregisterListener(this, sens);
+        }
+        //shared_merk = 2;
+        // Offset_shared = (int) (Offset * 1000000.0);
+        //mittelwertsumme_shared = (int) (mittelwertsumme * 1000000.0);
+
+        //StringBuilder ar = new StringBuilder();
+        //for (int z=0; z < listen_groesse; z++){
+        //ar.append(Gesamt_be.get(z)).append(";");
+        //}
+        //Array_shared = ar.toString();
+
+        //SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
+        //SharedPreferences.Editor editor = p.edit();
+        //editor.putInt(KEY_Mittelwertsumme, mittelwertsumme_shared);
+        //editor.putInt(KEY_kalibirieren, kalibrieren);
+        //editor.putInt(KEY_Offset, Offset_shared);
+        //editor.putString(KEY_Gesamt_be, Array_shared);
+        //editor.commit();
+    }
+
+    // KAMERA //
+    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 -> {
+
+                    int imageFormat = imageProxy.getFormat();
+
+                    if (imageFormat == ImageFormat.YUV_420_888) {
+
+                        Image currentImage = imageProxy.getImage();
+
+                        if (previousHeight != 0) {
+                            assert currentImage != null;
+                            isMotionDetected = compareFrames(currentImage);
+                        }
+
+                        assert currentImage != null;
+                        Image.Plane[] planes = currentImage.getPlanes();
+                        ByteBuffer buffer = planes[0].getBuffer().duplicate();
+                        previousBuffer = ByteBuffer.allocateDirect(buffer.remaining());
+                        previousBuffer.put(buffer);
+                        previousWidth = currentImage.getWidth();
+                        previousHeight = currentImage.getHeight();
+
+                        currentImage.close();
+
+                        if (isMotionDetected) {
+                            alarm.setText("ALARM");
+                            camera_alarm = true;
+                        } else {
+                            camera_alarm = false;
+                            alarm.setText("OK");
+                        }
+
+                    }
+
+                    imageProxy.close();
+                });
+
+        // Preview preview = new Preview.Builder().build();
+
+        CameraSelector cameraSelector = new CameraSelector.Builder().requireLensFacing(CameraSelector.LENS_FACING_BACK).build();
+
+        // PREVIEW //
+        // preview.setSurfaceProvider(previewView.getSurfaceProvider());
+
+        cameraProvider.bindToLifecycle(this, cameraSelector, imageAnalysis);
+
+    }
+
+    // Bildverarbeitung zur Bewegungserkennung
+    private boolean compareFrames(Image currentImage) {
+
+        ByteBuffer currentBuffer = currentImage.getPlanes()[0].getBuffer();
+
+        int currentWidth = currentImage.getWidth();
+        int currentHeight = currentImage.getHeight();
+
+        if (previousWidth != currentWidth || previousHeight != currentHeight) {
+            return false;
+        }
+
+        for (int row = 0; row < previousHeight; row++) {
+            for (int col = 0; col < previousWidth; col++) {
+
+                int previousIndex = row * previousWidth + col;
+                int currentIndex = row * currentWidth + col;
+
+                int previousPixel = previousBuffer.get(previousIndex) & 0xFF;
+                int currentPixel = currentBuffer.get(currentIndex) & 0xFF;
+
+                int pixelDifference = Math.abs(previousPixel - currentPixel);
+                int threshold = 120;
+
+                if (pixelDifference > threshold) {
+                    // Testzwecke
+                    //String text = String.valueOf(pixelDifference);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}

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

@@ -1,25 +1,40 @@
 package com.example.greenwatch;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.view.View;
 import android.widget.Button;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 public class MainActivity extends AppCompatActivity {
+    private static final int RECHTEANFORDERUNG_KAMERA = 10;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
+        Button kameraStarten = findViewById(R.id.button_camera);
-        ((Button)findViewById(R.id.buttonstartmicdetection)).setOnClickListener(new View.OnClickListener(){
+        kameraStarten.setOnClickListener(v -> {
-            @Override
+            if (istZugriffAufKameraErlaubt()) {
-            public void onClick(View view) {
+                starteKameraAktivitaet();
-                Intent i = new Intent(MainActivity.this, Mikrofon.class);
+            } else {
-                startActivity(i);
+                zugriffAufKameraAnfordern();
             }
         });
     }
+
+    private boolean istZugriffAufKameraErlaubt() {
+        return ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void zugriffAufKameraAnfordern() {
+        ActivityCompat.requestPermissions(this,new String[]{android.Manifest.permission.CAMERA}, RECHTEANFORDERUNG_KAMERA);
+    }
+
+    private void starteKameraAktivitaet() {
+        startActivity(new Intent(this, KameraAktivitaet.class));
+    }
 }

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

@@ -1,254 +1,4 @@
 package com.example.greenwatch;
 
-import androidx.appcompat.app.AppCompatActivity;
+public class Mikrofon {
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import android.Manifest;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.media.AudioFormat;
-import android.media.AudioRecord;
-import android.media.MediaRecorder;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.widget.TextView;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class Mikrofon extends AppCompatActivity {
-
-    private AufnahmeTask aufnahmeTask;
-    private TextView textViewMaxAmp;
-    private TextView textViewMaxAmpdb;
-    private TextView textViewZeitstempel;
-    private static final int RECHTEANFORDERUNG_MIKROFON = 1;
-
-    private boolean detection_mic = false;
-    private String zeit = "0";
-    private boolean kalibrierung_do = true;
-    private float threshold = 40;
-    private float sensitivity = 5;
-    private final static String KEY_WERT = "KEY_WERT_" + Mikrofon.class.getSimpleName();
-    private final static String KEY_KALIBRIERUNG = "KEY_KALIBRIERUNG_" + Mikrofon.class.getSimpleName();
-
-
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_mikrofon);
-        textViewMaxAmp = (TextView) findViewById(R.id.textViewMaxAmp);
-        textViewMaxAmpdb = (TextView) findViewById(R.id.textViewMaxAmpdb);
-        textViewZeitstempel = (TextView) findViewById(R.id.textViewZeitstempel);
-        //kalibrierung_do = true;
-
-
-    }
-
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
-        threshold = p.getFloat(KEY_WERT, 40);
-        kalibrierung_do = p.getBoolean(KEY_KALIBRIERUNG, true);
-
-        if (!istZugriffAufMikrofonErlaubt()) {
-            zugriffAufMikrofonAnfordern();
-        }
-        if (istZugriffAufMikrofonErlaubt()) {
-            aufnahmeTask = new AufnahmeTask();
-            aufnahmeTask.execute();
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        SharedPreferences p = getPreferences(Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = p.edit();
-        editor.putFloat(KEY_WERT, threshold);
-        if(isFinishing()==true){
-            editor.putBoolean(KEY_KALIBRIERUNG, true);
-        }else {
-            editor.putBoolean(KEY_KALIBRIERUNG, false);
-        }
-        editor.commit();
-        if(aufnahmeTask!=null) {
-            aufnahmeTask.cancel(true);
-            aufnahmeTask = null;
-        }
-    }
-
-    private boolean istZugriffAufMikrofonErlaubt() {
-        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    private void zugriffAufMikrofonAnfordern() {
-        ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.RECORD_AUDIO}, RECHTEANFORDERUNG_MIKROFON);
-    }
-
-    public static String Zeitpunkt(){
-        Long tslong = System.currentTimeMillis();
-        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-        Date date = new Date(tslong);
-        String resultdate = sdf.format(date);
-
-        return resultdate;
-    }
-
-
-    class AufnahmeTask extends AsyncTask<Long, Verarbeitungsergebnis, Void> {
-        private AudioRecord recorder;
-        private final int sampleRateInHz = 44100;
-        private final int channelConfig = AudioFormat.CHANNEL_IN_MONO;
-        private final int audioFormat = AudioFormat.ENCODING_PCM_16BIT;
-        private int minPufferGroesseInBytes;
-        private int pufferGroesseInBytes;
-        private RingPuffer ringPuffer = new RingPuffer(10);
-        private boolean erlaubt_rise = true;
-        private boolean erlaubt_fall = true;
-
-        AufnahmeTask() {
-            minPufferGroesseInBytes = AudioRecord.getMinBufferSize(sampleRateInHz, channelConfig, audioFormat);
-            pufferGroesseInBytes = minPufferGroesseInBytes * 2;
-            recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRateInHz, channelConfig, audioFormat, pufferGroesseInBytes);
-        }
-        //hi
-        public float kalibrieren(short[] puffer){
-            try {
-                Thread.sleep(3000);
-
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            int anzahlIterationen = 100;
-            float sum = 0;
-            for(int i = 0; i < anzahlIterationen; i++){
-                int z = recorder.read(puffer, 0, puffer.length);
-                Verarbeitungsergebnis kalibrierung = verarbeiten(puffer, z);
-                sum += (float) kalibrierung.db;
-                System.out.println("Aktueller_Wert Kalibrierung" +kalibrierung.db);
-            }
-            System.out.println("Summe:"+sum);
-            return sum/anzahlIterationen;
-        }
-
-        public void Detektion(Verarbeitungsergebnis ergebnis){
-            if(ergebnis.db >= (threshold+sensitivity)){
-                detection_mic = true;
-                erlaubt_fall = true;
-                while(erlaubt_rise){
-                    erlaubt_rise = false;
-                    zeit = Zeitpunkt() + " - " + ergebnis.db + " - " + (threshold+sensitivity); //Überschreiben des Zeitpunkts beim Erkennen der Detektion
-                    //nur zum Testen in zeit noch ergebnis.db und threshold ausgegeben -> muss am Ende nur Zeitpunkt() rein, Rest weg
-                }
-            } else if (ergebnis.db <= (threshold)) {
-                detection_mic = false;
-                erlaubt_rise = true;
-                while(erlaubt_fall){
-                    erlaubt_fall = false;
-                    zeit = Zeitpunkt(); //erneutes Überschreiben des Zeitpunkts beim Verschwinden der Detektion
-                }
-            }
-        }
-        @Override
-        protected Void doInBackground(Long... params) {
-
-            recorder.startRecording();
-            short[] puffer = new short[pufferGroesseInBytes / 2];
-            GleitenderMittelwert gleitenderMittelwertdB = new GleitenderMittelwert(0.2f);
-            float db = 0;
-
-
-            //kalibrierung
-            if(kalibrierung_do){
-                threshold = kalibrieren(puffer);
-                kalibrierung_do = false;
-            }
-
-
-            for (; ; ) {
-                if (isCancelled()) {
-                    break;
-                } else {
-                    //ergebnis ermitteln
-                    int n = recorder.read(puffer, 0, puffer.length);
-                    Verarbeitungsergebnis ergebnis = verarbeiten(puffer, n);
-
-                    //Mittelwertberechnnung
-                    db = (float) ergebnis.db;
-                    db = gleitenderMittelwertdB.mittel(db);
-                    ergebnis.db = (int) db;
-
-                    //Db Wert mit Schwellwert vergleichen und Warnung setzen
-                    Detektion(ergebnis);
-                    publishProgress(ergebnis);
-
-                    try {
-                        Thread.sleep(10);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-            recorder.release();
-            return null;
-        }
-
-        private Verarbeitungsergebnis verarbeiten(short[] daten, int n) {
-            String status;
-            short maxAmp = -1;
-            int db = 0, db_wert = 0;
-
-            if (n == AudioRecord.ERROR_INVALID_OPERATION) {
-                status = "ERROR_INVALID_OPERATION";
-            } else if (n == AudioRecord.ERROR_BAD_VALUE) {
-                status = "ERROR_BAD_VALUE";
-            } else {
-                status = "OK";
-                short max = 0;
-                for (int i = 0; i < n; i++) {
-                    if (daten[i] > max) {
-                        max = daten[i];
-                    }
-                }
-                ringPuffer.hinzufuegen(max);
-                maxAmp = ringPuffer.maximum();
-            }
-            //Umwandlung Amplitudenwert in dB
-            db_wert = (int) (20*Math.log10(maxAmp));
-            if (db_wert > 0){
-                db = db_wert;
-            }
-
-
-            return new Verarbeitungsergebnis(status, maxAmp, db);
-        }
-
-        /////////////////////////////////////////////
-        @Override
-        protected void onProgressUpdate(Verarbeitungsergebnis... progress) {
-            super.onProgressUpdate(progress);
-
-
-            System.out.println(detection_mic);
-            System.out.println(zeit);
-            textViewZeitstempel.setText(zeit);
-
-            textViewMaxAmpdb.setText("" + progress[0].db);
-            textViewMaxAmp.setText("" + progress[0].maxAmp);
-
-        }
-    }
-    /////////////////////////////////////////////
-
 }

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

@@ -1,63 +0,0 @@
-package com.example.greenwatch;
-
-public class RingPuffer {
-
-    private short[] puffer;
-    private final int laenge;
-    private int anzahlEnthaltenerDaten;
-    private int position;
-
-
-    public RingPuffer(int n) {
-        laenge = n;
-        anzahlEnthaltenerDaten = 0;
-        position = 0;
-        puffer = new short[laenge];
-    }
-
-    public void hinzufuegen(short wert) {
-        puffer[position] = wert;
-        position++;
-        if (position >= laenge) {
-            position = 0;
-        }
-        if (anzahlEnthaltenerDaten < laenge) {
-            anzahlEnthaltenerDaten++;
-        }
-    }
-
-        /*public void hinzufuegen(short[] daten) {
-            for (short d : daten) {
-                puffer[position] = d;
-                position++;
-                if (position >= laenge) {
-                    position = 0;
-                }
-            }
-            if (anzahlEnthaltenerDaten < laenge) {
-                anzahlEnthaltenerDaten += daten.length;
-                if (anzahlEnthaltenerDaten >= laenge) {
-                    anzahlEnthaltenerDaten = laenge;
-                }
-            }
-        }*/
-
-    public short maximum() {
-        short max = 0;
-        for (int i = 0; i < anzahlEnthaltenerDaten; i++) {
-            if (puffer[i] > max) {
-                max = puffer[i];
-            }
-        }
-        return max;
-    }
-
-       /* public float mittelwert() {
-            float summe = 0;
-            for (int i = 0; i < anzahlEnthaltenerDaten; i++) {
-                summe += puffer[i];
-            }
-            return summe / anzahlEnthaltenerDaten;
-        }*/
-}
-

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

@@ -1,13 +0,0 @@
-package com.example.greenwatch;
-
-public class Verarbeitungsergebnis {
-    String status;
-    short maxAmp;
-    int db;
-//
-    Verarbeitungsergebnis(String status, short maxAmp, int db) {
-        this.status = status;
-        this.maxAmp = maxAmp;
-        this.db = db;
-    }
-}

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

@@ -0,0 +1,38 @@
+<?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=".Beschleunigungssensor">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/DatenBsensor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="" />
+
+        <TextView
+            android:id="@+id/WarnungBsensor"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="" />
+
+        <TextView
+            android:id="@+id/test"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="" />
+
+        <TextView
+            android:id="@+id/Alarm_Kamera"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="OK" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,54 @@
+<?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=".KameraAktivitaet">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/erklaerung">
+
+        <Button
+            android:id="@+id/button2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Button" />
+
+        <androidx.camera.view.PreviewView
+            android:id="@+id/previewView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        </androidx.camera.view.PreviewView>
+    </FrameLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/alarm"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:text=""
+            android:textSize="100sp"
+            android:textColor="#9999ff"/>
+        <TextView
+            android:id="@+id/threshold_test"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:text=""
+            android:textSize="100sp"
+            android:textColor="#9999ff"/>
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -7,12 +7,38 @@
     tools:context=".MainActivity">
 
     <Button
-        android:id="@+id/buttonstartmicdetection"
+        android:id="@+id/button_camera"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Starte Mikrofon Detection"
+        android:text="Kamera starten"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.129"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.931" />
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=" "
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.247" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@+id/textView" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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:paddingBottom="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:paddingTop="16dp"
-    tools:activity="com.example.greenwatch">
-
-
-
-
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="max. Amp: "
-        android:id="@+id/labelMaxAmp"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/textViewMaxAmp"
-        android:text=" "
-        android:layout_alignBaseline="@+id/labelMaxAmp"
-        android:layout_toEndOf="@+id/labelMaxAmpdb"/>
-
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="max. Amp in dB: "
-        android:id="@+id/labelMaxAmpdb"
-        android:layout_below="@+id/labelMaxAmp"
-        android:layout_alignParentStart="true"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/textViewMaxAmpdb"
-        android:text=" "
-        android:layout_alignBaseline="@+id/labelMaxAmpdb"
-        android:layout_toEndOf="@+id/labelMaxAmpdb"/>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Meldung: "
-        android:id="@+id/labelZeitstempel"
-        android:layout_below="@+id/labelMaxAmpdb"
-        android:layout_alignParentStart="true"/>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/textViewZeitstempel"
-        android:text=" "
-        android:layout_alignBaseline="@+id/labelZeitstempel"
-        android:layout_toEndOf="@+id/labelMaxAmpdb"/>
-
-
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/scrollView3"
-        android:layout_below="@+id/labelMaxAmpdb"
-        android:layout_alignParentStart="true">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/textViewLogger"/>
-    </ScrollView>
-
-</RelativeLayout>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.1.3' apply false
+    id 'com.android.application' version '8.0.0' apply false
-    id 'com.android.library' version '7.1.3' apply false
+    id 'com.android.library' version '8.0.0' apply false
 }
 
 task clean(type: Delete) {

gradle.properties

@@ -18,4 +18,6 @@ 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.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu May 11 14:50:16 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME