Kamera Preview ergänzt

app/src/main/AndroidManifest.xml

@@ -29,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/AccelerometerActivity.java

@@ -92,7 +92,7 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
             }
         });
 
-        mAccelerometerViewModel.getMovementDetectedValue().observe(this, new Observer<Boolean>() {
+        mAccelerometerViewModel.getAccelerometerAlarmDetected().observe(this, new Observer<Boolean>() {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {

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

@@ -27,6 +27,7 @@ public class MainActivity extends AppCompatActivity {
     private Button audiodetectionAndAccelerometerButton;
     private Button videodetectionAndAccelerometerButton;
     private Button connectionButton;
+    private Button prewview_kamera;
     private MainActivityViewModel mMainActivityViewModel;
 
     @Override
@@ -40,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));
@@ -84,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) {
@@ -131,6 +144,10 @@ public class MainActivity extends AppCompatActivity {
             }
         });
     }
+    public void openVideoPrewvoewActivity() {
+        Intent intent = new Intent(this, VideoPreviewActivity.class);
+        startActivity(intent);
+    }
     public void openAudiodetectionActivity(){
         Intent intent = new Intent(this, AudiodetectionActivity.class);
         startActivity(intent);

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/java/com/example/greenwatch/communication/WiFiCommunication.java

@@ -1,7 +1,5 @@
 package com.example.greenwatch.communication;
 
-import android.util.Log;
-
 import com.example.greenwatch.repositories.DeviceRepository;
 
 import java.io.IOException;
@@ -58,6 +56,23 @@ public class WiFiCommunication {
         this.isNewMessage = isNewMessage;
     }
 
+    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 stopCommunication() {
         running = false;
         socket.close();
@@ -74,7 +89,7 @@ public class WiFiCommunication {
                     {
                         isNewMessage = false;
                         //todo: adapt send String
-                        String txString = sendMessage;
+                        String txString = getLocalIpAddress() + " sends. #" + tmpCnt++ + sendMessage;
                         byte[] txBuffer = txString.getBytes();
 
                         DatagramPacket txPacket = new DatagramPacket(txBuffer, txBuffer.length, address, port);

app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java

@@ -1,21 +1,14 @@
 package com.example.greenwatch.repositories;
 
 
-import android.util.Log;
-
 import androidx.lifecycle.MutableLiveData;
 
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.communication.WiFiCommunication;
 
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
@@ -83,23 +76,21 @@ public class DeviceRepository {
 
     public void getNewReceivedMessage(String newMessage) {
         String[] messageString = messageStringSplitter(newMessage);
-        if(messageString[0]=="1" && messageString.length == 7){
-            String timeStamp = messageString[1];
-            String deviceID = messageString[3];
-            boolean sensorStatus = convertSensorStatus(messageString[4]);
-            String sensorType = messageString[5];
-            int sensorMassage = Integer.valueOf(messageString[6]);
+        String timeStamp = messageString[0];
+        String deviceID = messageString[1];
+        boolean sensorStatus = convertSensorStatus(messageString[2]);
+        String sensorType = messageString[3];
+        int sensorMassage = Integer.valueOf(messageString[4]);
 
-            if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
-                return;
-            }
+        if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
+            return;
+        }
 
-            if(!connectedDevicesList.containsKey(deviceID)) {
-                createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
-            }
-            else {
-                updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
-            }
+        if(!connectedDevicesList.containsKey(deviceID)) {
+            createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
+        }
+        else {
+            updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
         }
     }
 
@@ -107,14 +98,9 @@ public class DeviceRepository {
         StringBuilder message = new StringBuilder();
         Device device = connectedDevicesList.get(deviceID);
         if(device != null) {
-            message.append("1")
+            message.append(device.getTimeStamp())
                     .append(delimiter)
-                    .append(device.getTimeStamp())
-                    .append(delimiter)
-                    .append("Gruppe3")
-                    .append(delimiter)
-                    //.append(device.getDeviceID())
-                    .append(getLocalIpAddress(deviceID))
+                    .append(device.getDeviceID())
                     .append(delimiter)
                     .append(device.getSensorStatus())
                     .append(delimiter)
@@ -131,10 +117,6 @@ public class DeviceRepository {
                     .append(delimiter)
                     .append("")
                     .append(delimiter)
-                    .append("")
-                    .append(delimiter)
-                    .append("")
-                    .append(delimiter)
                     .append("");
         }
         return message.toString();
@@ -337,25 +319,4 @@ public class DeviceRepository {
         }
         return false;
     }
-
-    public String getLocalIpAddress(String deviceID) {
-        String checkedDeviceID = checkDeviceID(deviceID);
-        Device device = connectedDevicesList.get(checkedDeviceID);
-        if(device != null){
-            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 "";
-    }
 }

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

@@ -6,86 +6,59 @@ import androidx.lifecycle.ViewModel;
 
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.repositories.DeviceRepository;
+import com.example.greenwatch.sensors.AccelerometerSensor;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class AccelerometerViewModel extends ViewModel implements ViewModelInterface {
 
     private MutableLiveData<List<Device>> mDeviceList;
-    private MutableLiveData<Boolean> mMovementDetected = new MutableLiveData<>();
+    private MutableLiveData<Boolean> mAccelerometerAlarmDetected;
     private MutableLiveData<List<Device>> mAlarmHistoryList;
     private MutableLiveData<Boolean> mStartAlarmRecording;
+    private AccelerometerSensor mAccelerometerSensor;
     private DeviceRepository mDeviceRepository;
-    private ArrayList<Float> Gesamt_be;
-    int arraySize = 500;
-    int functionCallCount;
-    float meanValue;
-    float offsetValue;
-    float thresholdValue;
-    boolean startMeasuring;
 
     @Override
     public void init() {
-        if (mDeviceList == null) {
+        if (mDeviceRepository == null) {
             mDeviceRepository = DeviceRepository.getInstance();
+        }
+        if (mAccelerometerSensor == null) {
+            mAccelerometerSensor = AccelerometerSensor.getInstance();
+        }
+        if (mDeviceList == null) {
             mDeviceList = mDeviceRepository.getConnectedDeviceList();
+        }
+        if (mAlarmHistoryList == null) {
             mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
+        }
+        if (mStartAlarmRecording == null) {
             mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
         }
-        initGesamtBE();
-        mMovementDetected.setValue(false);
-        functionCallCount = 0;
-        meanValue = 0f;
-        offsetValue = 0.1f;
-        thresholdValue = 0.15f;
-        startMeasuring = false;
-    }
-
-    public void initGesamtBE() {
-        Gesamt_be = new ArrayList<>(arraySize);
-        for (int i = 0; i < arraySize; i++) {
-            Gesamt_be.add(0f);
+        if (mAccelerometerAlarmDetected == null) {
+            mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
         }
     }
 
     public void addValueToGesamtBE(float newValue) {
-        if (Gesamt_be.size() == arraySize) {
-            Gesamt_be.remove(Gesamt_be.size() -1);
-        }
-        Gesamt_be.add(0, newValue);
-        functionCallCount++;
+        mAccelerometerSensor.addValueToGesamtBE(newValue);
     }
 
     public void meanValueCalculation() {
-        for (float element : Gesamt_be) {
-            meanValue += Math.abs(element);
-        }
-        meanValue = meanValue/arraySize;
+        mAccelerometerSensor.meanValueCalculation();
     }
 
     public void calibrateAccelerometerSensor() {
-        if (functionCallCount <= arraySize) {
-            offsetValue = meanValue;
-        }
-        else {
-            startMeasuring = true;
-        }
+        mAccelerometerSensor.calibrateAccelerometerSensor();
     }
 
     public void checkAlarmCondition() {
-        if (meanValue > (thresholdValue + offsetValue) && startMeasuring && !mMovementDetected.getValue()) {
-            mMovementDetected.setValue(true);
-        }
-        else if (meanValue < (thresholdValue + offsetValue) && mMovementDetected.getValue()){
-            mMovementDetected.setValue(false);
-        }
+        mAccelerometerSensor.checkAlarmCondition();
     }
 
-    public LiveData<Boolean> getMovementDetectedValue() {
-        return mMovementDetected;
+    public LiveData<Boolean> getAccelerometerAlarmDetected() {
+        return mAccelerometerAlarmDetected;
     }
 
     @Override

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>