ergänzt dB Anzeige beim Kommen und Gehen der Detektion

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

@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.hardware.SensorEvent;
 import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.view.View;
@@ -88,15 +89,22 @@ public class AudiodetectionActivity extends AppCompatActivity {
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
                     mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
+                    microfonStatusMessage.setText("dB value - detected = " + (int) mMicrofonViewModel.getAmplitudeInDB() + " dB");
                 }
                 else {
                     mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
+                    if((int) mMicrofonViewModel.getAmplitudeInDB() > 0){
+                        microfonStatusMessage.setText("dB value - no longer detected = " + (int) mMicrofonViewModel.getAmplitudeInDB()+ " dB");
+                    }
                 }
 
             }
         });
+
+
     }
 
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -106,6 +114,9 @@ public class AudiodetectionActivity extends AppCompatActivity {
     @Override
     protected void onPause() {
         super.onPause();
+        if (isFinishing()){
+            mMicrofonViewModel.recalibrationMicrofonSensor();
+        }
         mMicrofonViewModel.stopMicrofonSensor();
     }
 }

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

@@ -92,14 +92,19 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    if (mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
+                    Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedTrue", Toast.LENGTH_LONG).show();
+                    if (mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected()) {
                         mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
                     }
-                    else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected()) {
+                    else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Microfon", (int) mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", (int) mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
+                    }
+                    else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2AudioAndAccelerometer", 10);
                     }
                 }
                 else {
+                    Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedFalse", Toast.LENGTH_LONG).show();
                     mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "AudioAndAccelerometer", 0);
                 }
 

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

@@ -101,12 +101,19 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                    if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                    }
+                    else if (mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 10);
+                    }
+                    else if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2VideoAndAccelerometer", 10);
+                    }
                 }
                 else {
-                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
+                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0);
                 }
-
             }
         });
 

app/src/main/java/com/example/greenwatch/sensors/CameraSensor.java

@@ -3,6 +3,7 @@ package com.example.greenwatch.sensors;
 import android.content.Context;
 import android.graphics.ImageFormat;
 import android.media.Image;
+import android.os.Handler;
 import android.util.Size;
 
 import androidx.camera.core.CameraSelector;
@@ -18,9 +19,18 @@ public class CameraSensor {
     private final MutableLiveData<Boolean> mVideoAlarmDetected = new MutableLiveData<>();
     private static CameraSensor cameraSensorInstance;
     private boolean videoAlarmDetected;
+    private boolean isMotionDetected;
     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();
 
     private CameraSensor() {
         videoAlarmDetected = false;
@@ -59,7 +69,7 @@ public class CameraSensor {
 
                         if (previousHeight != 0) {
                             assert currentImage != null;
-                            videoAlarmDetected = compareFrames(currentImage);
+                            isMotionDetected = compareFrames(currentImage);
                         }
 
                         assert currentImage != null;
@@ -72,6 +82,18 @@ public class CameraSensor {
 
                         currentImage.close();
 
+                        if (isMotionDetected) {
+
+                            videoAlarmDetected = true;
+
+                            if(alarmResetRunnable != null) {
+                                alarmResetHandler.removeCallbacks(alarmResetRunnable);
+                            }
+
+                            alarmResetRunnable = this::resetAlarmStatus;
+                            alarmResetHandler.postDelayed(alarmResetRunnable, ALARM_RESET_DELAY);
+                        }
+
                         checkAlarmCondition();
 
                     }
@@ -85,36 +107,76 @@ public class CameraSensor {
     }
 
     private boolean compareFrames(Image currentImage) {
-
+        Image.Plane[] planes = currentImage.getPlanes();
-        ByteBuffer currentBuffer = currentImage.getPlanes()[0].getBuffer();
+        ByteBuffer currentBuffer = planes[0].getBuffer();
-
         int currentWidth = currentImage.getWidth();
         int currentHeight = currentImage.getHeight();
+        int yRowStride = planes[0].getRowStride();
+        int yPixelStride = planes[0].getPixelStride();
 
         if (previousWidth != currentWidth || previousHeight != currentHeight) {
             return false;
         }
 
-        for (int row = 0; row < previousHeight; row++) {
+        int blockSize = kleinstesQuadrat(previousHeight, previousWidth) / 8;
-            for (int col = 0; col < previousWidth; col++) {
 
-                int previousIndex = row * previousWidth + col;
+        int numBlocksX = currentWidth / blockSize;
-                int currentIndex = row * currentWidth + col;
+        int numBlocksY = currentHeight / blockSize;
 
-                int previousPixel = previousBuffer.get(previousIndex) & 0xFF;
+        for (int blockY = 0; blockY < numBlocksY; blockY++) {
-                int currentPixel = currentBuffer.get(currentIndex) & 0xFF;
+            for (int blockX = 0; blockX < numBlocksX; blockX++) {
+                startX = blockX * blockSize;
+                startY = blockY * blockSize;
+                endX = startX + blockSize;
+                endY = startY + blockSize;
 
-                int pixelDifference = Math.abs(previousPixel - currentPixel);
+                float currentLuminance = berechneMittlereLuminanz(currentBuffer, yRowStride, yPixelStride);
-                int threshold = 120;
+                float previousLuminance = berechneMittlereLuminanz(previousBuffer, yRowStride, yPixelStride);
+
+                int pixelDifference = Math.abs((int) previousLuminance - (int) currentLuminance);
 
                 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() {
+        videoAlarmDetected = false;
+        alarmResetRunnable = null;
+    }
+
     public void checkAlarmCondition() {
         if (videoAlarmDetected && !mVideoAlarmDetected.getValue()) {
             setMutableLiveDataVideoAlarmDetected();

app/src/main/java/com/example/greenwatch/sensors/MicrofonSensor.java

@@ -19,7 +19,7 @@ import com.example.greenwatch.sensors.MicrofonHelperClasses.Verarbeitungsergebni
      private boolean microfonAlarmDetected = false;
      private boolean kalibrierung_do = true;
      private float threshold = 40;
-     private float sensitivity = 5;
+     private float sensitivity = 10;
 
      private float amplitudeInDB = 0;
 
@@ -52,9 +52,8 @@ import com.example.greenwatch.sensors.MicrofonHelperClasses.Verarbeitungsergebni
          microfonAlarmDetected = false;
          kalibrierung_do = true;
          threshold = 40;
-         sensitivity = 5;
+         sensitivity = 10;
          amplitudeInDB = 0;
-         start();
      }
 
      public float getAmplitudeInDB() {
@@ -98,6 +97,7 @@ import com.example.greenwatch.sensors.MicrofonHelperClasses.Verarbeitungsergebni
              for(int i = 0; i < anzahlIterationen; i++){
                  int z = recorder.read(puffer, 0, puffer.length);
                  Verarbeitungsergebnis kalibrierung = verarbeiten(puffer, z);
+                 System.out.println("Kalibrierung" + kalibrierung.getDB());
                  sum += kalibrierung.getDB();
              }
              return sum/anzahlIterationen;

app/src/main/java/com/example/greenwatch/viewmodels/AudiodetectionAndAccelerometerViewModel.java

@@ -120,12 +120,12 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
         public void onChanged(Boolean aBoolean) {
             setAccelerometerAlarmDetected(mAccelerometerAlarmDetected.getValue());
             setMicrofonAlarmDetected(mMicrofonAlarmDetected.getValue());
-            if (microfonAlarmDetected || accelerometerAlarmDetected && !microfondetectionAndAccelerometerAlarmDetected) {
+            if (microfonAlarmDetected || accelerometerAlarmDetected) {
                 microfondetectionAndAccelerometerAlarmDetected = true;
                 setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
 
             }
-            else if (!microfonAlarmDetected && !accelerometerAlarmDetected && microfondetectionAndAccelerometerAlarmDetected) {
+            else if (!microfonAlarmDetected && !accelerometerAlarmDetected) {
                 microfondetectionAndAccelerometerAlarmDetected = false;
                 setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
             }

app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionAndAccelerometerViewModel.java

@@ -26,7 +26,9 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
     private AccelerometerSensor mAccelerometerSensor;
     private CameraSensor mCameraSensor;
     private DeviceRepository mDeviceRepository;
-    private boolean VideodetectionAndAccelerometerAlarmDetected;
+    private boolean videoAlarmDetected;
+    private boolean accelerometerAlarmDetected;
+    private boolean videodetectionAndAccelerometerAlarmDetected;
 
     @Override
     public void init() {
@@ -54,7 +56,9 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
         if (mVideoAlarmDetected == null) {
             mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
         }
-        VideodetectionAndAccelerometerAlarmDetected = false;
+        videodetectionAndAccelerometerAlarmDetected = false;
+        videoAlarmDetected = false;
+        accelerometerAlarmDetected = false;
         registerAlarmObserver();
     }
 
@@ -84,19 +88,37 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
     }
 
     private void setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected() {
-        mVideodetectionAndAccelerometerAlarmDetected.setValue(VideodetectionAndAccelerometerAlarmDetected);
+        mVideodetectionAndAccelerometerAlarmDetected.setValue(videodetectionAndAccelerometerAlarmDetected);
+    }
+
+    private void setAccelerometerAlarmDetected(boolean accelerometerAlarmDetected) {
+        this.accelerometerAlarmDetected = accelerometerAlarmDetected;
+    }
+
+    public boolean getAccelerometerAlarmDetected() {
+        return accelerometerAlarmDetected;
+    }
+
+    private void setVideoAlarmDetected(boolean videoAlarmDetected) {
+        this.videoAlarmDetected = videoAlarmDetected;
+    }
+
+    public boolean getVideoAlarmDetected() {
+        return videoAlarmDetected;
     }
 
     Observer<Boolean> observer = new Observer<Boolean>() {
         @Override
         public void onChanged(Boolean aBoolean) {
-            if (mVideoAlarmDetected.getValue() || mAccelerometerAlarmDetected.getValue() && !VideodetectionAndAccelerometerAlarmDetected) {
+            setAccelerometerAlarmDetected(mAccelerometerAlarmDetected.getValue());
-                VideodetectionAndAccelerometerAlarmDetected = true;
+            setVideoAlarmDetected(mVideoAlarmDetected.getValue());
+            if (videoAlarmDetected || accelerometerAlarmDetected && !videodetectionAndAccelerometerAlarmDetected) {
+                videodetectionAndAccelerometerAlarmDetected = true;
                 setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
 
             }
-            else if (!mVideoAlarmDetected.getValue() && !mAccelerometerAlarmDetected.getValue() && VideodetectionAndAccelerometerAlarmDetected) {
+            else if (!videoAlarmDetected && !accelerometerAlarmDetected && videodetectionAndAccelerometerAlarmDetected) {
-                VideodetectionAndAccelerometerAlarmDetected = false;
+                videodetectionAndAccelerometerAlarmDetected = false;
                 setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
             }
         }