Senden der Geräte-IP-Adresse (in Device Repository)

Senden der zusammengesetzten Nachricht vom Message String Builder --> Teile der alten Testnachricht in WiFiCommunication entfernt

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.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <uses-feature android:name="android.hardware.camera"/>
 

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

@@ -32,7 +32,6 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
     private TextView accelerometerWarningTV;
     private Button backToMainActivityButton;
     private AccelerometerViewModel mAccelerometerViewModel;
-    private Permission permission = new Permission();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -85,18 +84,7 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    if(permission.alarmRechtePruefen(AccelerometerActivity.this, AccelerometerActivity.this)){
                     Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                        //todo AlarmHandling einfügen
-                    } else {
-                        permission.alarmRechteAnfordern(AccelerometerActivity.this);
-                        if(permission.alarmRechtePruefen(AccelerometerActivity.this, AccelerometerActivity.this)){
-                            Toast.makeText(AccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                            //todo Alarmhandling einfügen
-                        } else {
-                            Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                        }
-                    }
                 }
                 else {
                     Toast.makeText(AccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
@@ -104,7 +92,7 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
             }
         });
 
-        mAccelerometerViewModel.getAccelerometerAlarmDetected().observe(this, new Observer<Boolean>() {
+        mAccelerometerViewModel.getMovementDetectedValue().observe(this, new Observer<Boolean>() {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {

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

@@ -1,126 +1,27 @@
 package com.example.greenwatch;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
-import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
-import com.example.greenwatch.adapters.DeviceListAdapter;
-import com.example.greenwatch.models.Device;
-import com.example.greenwatch.viewmodels.AccelerometerViewModel;
-import com.example.greenwatch.viewmodels.MicrofonViewModel;
-
-import java.util.List;
 
 public class AudiodetectionActivity extends AppCompatActivity {
-    private TextView microfonStatusMessage;
+
     private Button backToMainActivityButton;
-    private Permission permission = new Permission();
-    private MicrofonViewModel mMicrofonViewModel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_audiodetection);
 
-        microfonStatusMessage = (TextView) findViewById(R.id.tvAudiodetectionStatusmessage);
         backToMainActivityButton = (Button) findViewById(R.id.audiodetectorBackToMainActivity);
 
-        RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        recyclerView.setHasFixedSize(true);
-
-        final DeviceListAdapter deviceListAdapter = new DeviceListAdapter();
-        recyclerView.setAdapter(deviceListAdapter);
-
-        RecyclerView alarmHistoryListRecyclerView = findViewById(R.id.alarmHistoryListRecyclerView);
-        alarmHistoryListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
-        alarmHistoryListRecyclerView.setHasFixedSize(true);
-
-        final AlarmHistoryListAdapter alarmHistoryListAdapter  = new AlarmHistoryListAdapter();
-        alarmHistoryListRecyclerView.setAdapter(alarmHistoryListAdapter);
-
         backToMainActivityButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
             }
         });
-
-        mMicrofonViewModel = new ViewModelProvider(this).get(MicrofonViewModel.class);
-        mMicrofonViewModel.init();
-        mMicrofonViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
-            @Override
-            public void onChanged(List<Device> devices) {
-                deviceListAdapter.setDevices(devices);
-            }
-        });
-
-        mMicrofonViewModel.getAlarmHistoryList().observe(this, new Observer<List<Device>>() {
-            @Override
-            public void onChanged(List<Device> devices) {
-                alarmHistoryListAdapter.setAlarmHistoryList(devices);
-            }
-        });
-
-        mMicrofonViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
-            @Override
-            public void onChanged(Boolean aBoolean) {
-                if (aBoolean) {
-                    if(permission.alarmRechtePruefen(AudiodetectionActivity.this, AudiodetectionActivity.this)){
-                        Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                        //todo AlarmHandling einfügen
-                    } else {
-                        permission.alarmRechteAnfordern(AudiodetectionActivity.this);
-                        if(permission.alarmRechtePruefen(AudiodetectionActivity.this, AudiodetectionActivity.this)){
-                            Toast.makeText(AudiodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                            //todo Alarmhandling einfügen
-                        } else {
-                            Toast.makeText(AudiodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                        }
-                    }
-                }
-                else {
-                    Toast.makeText(AudiodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-            }
-        });
-
-        mMicrofonViewModel.getMicrofonAlarmDetected().observe(this, new Observer<Boolean>() {
-            @Override
-            public void onChanged(Boolean aBoolean) {
-                if (aBoolean) {
-                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
-                }
-                else {
-                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
-                }
-
-            }
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mMicrofonViewModel.startMicrofonSensor();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (isFinishing()){
-            mMicrofonViewModel.recalibrationMicrofonSensor();
-        }
-        mMicrofonViewModel.stopMicrofonSensor();
     }
 }

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

@@ -1,182 +1,27 @@
 package com.example.greenwatch;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
-import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
-import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
 
-import com.example.greenwatch.adapters.AlarmHistoryListAdapter;
+public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity {
-import com.example.greenwatch.adapters.DeviceListAdapter;
-import com.example.greenwatch.models.Device;
-import com.example.greenwatch.viewmodels.AudiodetectionAndAccelerometerViewModel;
-import com.example.greenwatch.viewmodels.VideodetectionAndAccelerometerViewModel;
 
-import java.util.List;
-
-public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity implements SensorEventListener {
-    private SensorManager accelerometerManager;
-    private Sensor accelerometerSensor;
-    private TextView audiodetectionAndAccelerometerStatusMessage;
-    private AudiodetectionAndAccelerometerViewModel mAudiodetectionAndAccelerometerViewModel;
     private Button backToMainActivity;
 
-    private Permission permission = new Permission();
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_audiodetection_and_accelerometer);
 
-        audiodetectionAndAccelerometerStatusMessage = (TextView) findViewById(R.id.tvAudiodetectionAndAccelerometerStatusmessage);
         backToMainActivity = (Button) findViewById(R.id.audiodetectionAndAccelerometerBackToMainActivity);
 
-        RecyclerView recyclerView = findViewById(R.id.deviceListRecyclerView);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        recyclerView.setHasFixedSize(true);
-
-        final DeviceListAdapter deviceListAdapter = new DeviceListAdapter();
-        recyclerView.setAdapter(deviceListAdapter);
-
-        RecyclerView alarmHistoryListRecyclerView = findViewById(R.id.alarmHistoryListRecyclerView);
-        alarmHistoryListRecyclerView.setLayoutManager(new LinearLayoutManager(this));
-        alarmHistoryListRecyclerView.setHasFixedSize(true);
-
-        final AlarmHistoryListAdapter alarmHistoryListAdapter  = new AlarmHistoryListAdapter();
-        alarmHistoryListRecyclerView.setAdapter(alarmHistoryListAdapter);
-
         backToMainActivity.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
             }
         });
-
-        mAudiodetectionAndAccelerometerViewModel = new ViewModelProvider(this).get(AudiodetectionAndAccelerometerViewModel.class);
-        mAudiodetectionAndAccelerometerViewModel.init();
-        mAudiodetectionAndAccelerometerViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
-            @Override
-            public void onChanged(List<Device> devices) {
-                deviceListAdapter.setDevices(devices);
-            }
-        });
-
-        mAudiodetectionAndAccelerometerViewModel.getAlarmHistoryList().observe(this, new Observer<List<Device>>() {
-            @Override
-            public void onChanged(List<Device> devices) {
-                alarmHistoryListAdapter.setAlarmHistoryList(devices);
-            }
-        });
-
-        mAudiodetectionAndAccelerometerViewModel.getStartAlarmRecording().observe(this, new Observer<Boolean>() {
-            @Override
-            public void onChanged(Boolean aBoolean) {
-                if (aBoolean) {
-                    if(permission.alarmRechtePruefen(AudiodetectionAndAccelerometerActivity.this, AudiodetectionAndAccelerometerActivity.this)){
-                        Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                        //todo AlarmHandling einfügen
-                    } else {
-                        permission.alarmRechteAnfordern(AudiodetectionAndAccelerometerActivity.this);
-                        if(permission.alarmRechtePruefen(AudiodetectionAndAccelerometerActivity.this, AudiodetectionAndAccelerometerActivity.this)){
-                            Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                            //todo Alarmhandling einfügen
-                        } else {
-                            Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                        }
-                    }
-                }
-                else {
-                    Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                }
-            }
-        });
-
-        mAudiodetectionAndAccelerometerViewModel.getAudiodetectionAndAccelerometerAlarmDetected().observe(this, new Observer<Boolean>() {
-            @Override
-            public void onChanged(Boolean aBoolean) {
-                if (aBoolean) {
-                    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() && !mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        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);
-                }
-
-            }
-        });
-
-        accelerometerManager = (SensorManager) getSystemService(SENSOR_SERVICE);
-        if (accelerometerManager.getSensorList(Sensor.TYPE_GYROSCOPE).size() == 0) {
-            accelerometerSensor = null;
-            Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "No accelerometer sensor available", Toast.LENGTH_LONG).show();
-        }
-        else {
-            accelerometerSensor = accelerometerManager.getSensorList(Sensor.TYPE_GYROSCOPE).get(0);
-        }
-    }
-
-    @Override
-    public void onSensorChanged(SensorEvent event) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("x=")
-                .append(event.values[0])
-                .append("\ny=")
-                .append(event.values[1])
-                .append("\nz=")
-                .append(event.values[2]);
-        audiodetectionAndAccelerometerStatusMessage.setText(sb.toString());
-        mAudiodetectionAndAccelerometerViewModel.addValueToGesamtBE(event.values[0] + event.values[1] + event.values[2]);
-        mAudiodetectionAndAccelerometerViewModel.meanValueCalculation();
-        mAudiodetectionAndAccelerometerViewModel.calibrateAccelerometerSensor();
-        mAudiodetectionAndAccelerometerViewModel.checkAlarmCondition();
-    }
-
-    @Override
-    public void onAccuracyChanged(Sensor sensor, int accuracy) {
-
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mAudiodetectionAndAccelerometerViewModel.startMicrofonSensor();
-        if (accelerometerSensor != null) {
-            if (accelerometerManager.registerListener(this, accelerometerSensor, SensorManager.SENSOR_DELAY_GAME)) {
-                Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "We registered to the sensor", Toast.LENGTH_LONG).show();
-            } else {
-                Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "Registration did not work", Toast.LENGTH_LONG).show();
-            }
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        if (isFinishing()){
-            mAudiodetectionAndAccelerometerViewModel.recalibrationMicrofonSensor();
-        }
-        mAudiodetectionAndAccelerometerViewModel.stopMicrofonSensor();
-        if (accelerometerSensor != null) {
-            accelerometerManager.unregisterListener(this, accelerometerSensor);
-        }
     }
 }

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

@@ -6,8 +6,6 @@ import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -19,7 +17,6 @@ import com.example.greenwatch.adapters.DeviceListAdapter;
 import com.example.greenwatch.models.Device;
 import com.example.greenwatch.viewmodels.MainActivityViewModel;
 
-
 import java.util.List;
 
 public class MainActivity extends AppCompatActivity {
@@ -31,19 +28,12 @@ public class MainActivity extends AppCompatActivity {
     private Button videodetectionAndAccelerometerButton;
     private Button connectionButton;
     private MainActivityViewModel mMainActivityViewModel;
-    private Permission permission = new Permission();
-
-    private Activity activity = new Activity();
-    private Context context;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        activity = MainActivity.this;
-        context = MainActivity.this;
-
         audiodetectionButton = (Button) findViewById(R.id.audiodetectionButton);
         videodetectionButton = (Button) findViewById(R.id.videodetectionButton);
         accelerometerButton = (Button) findViewById(R.id.accelerometerButton);
@@ -65,10 +55,9 @@ public class MainActivity extends AppCompatActivity {
         final AlarmHistoryListAdapter alarmHistoryListAdapter  = new AlarmHistoryListAdapter();
         alarmHistoryListRecyclerView.setAdapter(alarmHistoryListAdapter);
 
-        permission.startRechtePruefen(this, this);
-
         mMainActivityViewModel = new ViewModelProvider(this).get(MainActivityViewModel.class);
         mMainActivityViewModel.init();
+        mMainActivityViewModel.accessRequestCamera(this);
         mMainActivityViewModel.getConnectedDeviceList().observe(this, new Observer<List<Device>>() {
             @Override
             public void onChanged(List<Device> devices) {
@@ -87,18 +76,7 @@ public class MainActivity extends AppCompatActivity {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    if(permission.alarmRechtePruefen(context, activity)){
                     Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                        //todo AlarmHandling einfügen
-                    } else {
-                        permission.alarmRechteAnfordern(activity);
-                        if(permission.alarmRechtePruefen(context, activity)){
-                            Toast.makeText(MainActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                            //todo Alarmhandling einfügen
-                        } else {
-                            Toast.makeText(MainActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                        }
-                    }
                 }
                 else {
                     Toast.makeText(MainActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
@@ -109,23 +87,18 @@ public class MainActivity extends AppCompatActivity {
         audiodetectionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                //openAudiodetectionActivity();
-                if (permission.microRechtePruefen(context, activity)) {
+                mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51",  false, "Audio", 10);
-                    openAudiodetectionActivity();
-                }
-                else {
-                    permission.microRechteAnfordern(activity);
-                }
             }
         });
         videodetectionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (permission.kameraRechtePruefen(context, activity)) {
+                if (mMainActivityViewModel.isCameraAccessAllowed(MainActivity.this)) {
                     openVideodetectionActivity();
                 }
                 else {
-                    permission.kameraRechteAnfordern(activity);
+                    mMainActivityViewModel.accessRequestCamera(MainActivity.this);
                 }
             }
         });
@@ -139,24 +112,17 @@ public class MainActivity extends AppCompatActivity {
         audiodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (permission.microRechtePruefen(context, activity)) {
+                //openAudiodetectionAndAccelerometerActivity();
-                    openAudiodetectionAndAccelerometerActivity();
+                mMainActivityViewModel.setSensorType(mMainActivityViewModel.getLocalDeviceUUID(), "AudiodetectionAndAccelerometer");
-                }
+                mMainActivityViewModel.setTimeStamp(mMainActivityViewModel.getLocalDeviceUUID(), "00:00");
-                else {
+                mMainActivityViewModel.setDeviceID(mMainActivityViewModel.getLocalDeviceUUID(), "6789");
-                    permission.microRechteAnfordern(activity);
-                }
             }
         });
         videodetectionAndAccelerometerButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (permission.kameraRechtePruefen(context, activity)) {
                 openVideodetectionAndAccelerometerActivity();
             }
-                else {
-                    permission.kameraRechteAnfordern(activity);
-                }
-            }
         });
         connectionButton.setOnClickListener(new View.OnClickListener() {
             @Override

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

@@ -1,128 +0,0 @@
-package com.example.greenwatch;
-
-import static android.Manifest.permission.CAMERA;
-import static android.Manifest.permission.RECORD_AUDIO;
-import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
-import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
-
-import static androidx.core.app.ActivityCompat.requestPermissions;
-import static androidx.core.content.ContextCompat.checkSelfPermission;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-
-
-public class Permission {
-    private static final int PERMISSION_REQUEST_MICRO = 1;
-    private static final int PERMISSION_REQUEST_CAMERA = 2;
-    private static final int PERMISSION_REQUEST_ALARM = 1234;
-    private static final int PERMISSION_REQUEST_START = 1235;
-
-    public void startRechtePruefen(Context context, Activity activity){
-        boolean rechtKamera = checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;
-        boolean rechtAudio = checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
-        boolean rechtSchreiben = checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
-        boolean rechtLesen = checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
-
-        Log.d("Kamera Rechte", String.valueOf(rechtKamera));
-        Log.d("Audio Rechte", String.valueOf(rechtAudio));
-        Log.d("Schreib Rechte", String.valueOf(rechtSchreiben));
-        Log.d("Lese Rechte", String.valueOf(rechtLesen));
-
-        if(rechtKamera && rechtAudio && rechtSchreiben && rechtLesen){
-            Log.d("Rechte", "erteilt");
-        } else {
-            startRechteAnfordern(activity);
-        }
-    }
-
-    public boolean kameraRechtePruefen(Context context, Activity activity){
-        boolean rechtKamera = checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;
-        Log.d("Kamera Rechte", String.valueOf(rechtKamera));
-
-        if(rechtKamera){
-            Log.d("Kamerarechte", "erteilt");
-            return true;
-        } else {
-            kameraRechteAnfordern(activity);
-            if(checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED){
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    public boolean microRechtePruefen(Context context, Activity activity){
-        boolean rechtAudio = checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
-        Log.d("Audio Rechte", String.valueOf(rechtAudio));
-
-        if(rechtAudio){
-            Log.d("Rechte", "erteilt");
-            return true;
-        } else {
-            microRechteAnfordern(activity);
-            if(checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED){
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    public boolean alarmRechtePruefen(Context context, Activity activity){
-        boolean rechtKamera = checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED;
-        boolean rechtAudio = checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
-        boolean rechtSchreiben = checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
-        boolean rechtLesen = checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
-
-        Log.d("Kamera Rechte", String.valueOf(rechtKamera));
-        Log.d("Audio Rechte", String.valueOf(rechtAudio));
-        Log.d("Schreib Rechte", String.valueOf(rechtSchreiben));
-        Log.d("Lese Rechte", String.valueOf(rechtLesen));
-
-        if(rechtKamera && rechtAudio && rechtSchreiben && rechtLesen){
-            Log.d("Rechte", "erteilt");
-            return true;
-        } else {
-            alarmRechteAnfordern(activity);
-            if(checkSelfPermission(context, CAMERA) == PackageManager.PERMISSION_GRANTED
-                    && checkSelfPermission(context, RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED
-                    && checkSelfPermission(context, WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED
-                    && checkSelfPermission(context, READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED){
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
-
-    public void startRechteAnfordern(Activity activity){
-        ActivityCompat.requestPermissions(activity, new String[]{CAMERA, RECORD_AUDIO, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_START);
-    }
-
-    public void kameraRechteAnfordern(Activity activity){
-        ActivityCompat.requestPermissions(activity, new String[]{CAMERA}, PERMISSION_REQUEST_CAMERA);
-    }
-
-    public void microRechteAnfordern(Activity activity){
-        ActivityCompat.requestPermissions(activity, new String[]{RECORD_AUDIO}, PERMISSION_REQUEST_MICRO);
-    }
-
-    public void alarmRechteAnfordern(Activity activity){
-        ActivityCompat.requestPermissions(activity, new String[]{CAMERA, RECORD_AUDIO, WRITE_EXTERNAL_STORAGE, READ_EXTERNAL_STORAGE}, PERMISSION_REQUEST_ALARM);
-    }
-
-}

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

@@ -27,7 +27,6 @@ public class VideodetectionActivity extends AppCompatActivity {
 
     private Button backToMainActivity;
     private VideodetectionViewModel mVideoDetectionViewModel;
-    private Permission permission = new Permission();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -77,18 +76,7 @@ public class VideodetectionActivity extends AppCompatActivity {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    if(permission.alarmRechtePruefen(VideodetectionActivity.this, VideodetectionActivity.this)){
                     Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                        //todo AlarmHandling einfügen
-                    } else {
-                        permission.alarmRechteAnfordern(VideodetectionActivity.this);
-                        if(permission.alarmRechtePruefen(VideodetectionActivity.this, VideodetectionActivity.this)){
-                            Toast.makeText(VideodetectionActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                            //todo Alarmhandling einfügen
-                        } else {
-                            Toast.makeText(VideodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                        }
-                    }
                 }
                 else {
                     Toast.makeText(VideodetectionActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();

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

@@ -37,7 +37,6 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
     private TextView videodetectionAndAccelerometerWarningTV;
     private Button backToMainActivity;
     private VideodetectionAndAccelerometerViewModel mVideodetectionAndAccelerometerViewModel;
-    private Permission permission = new Permission();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -90,18 +89,7 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    if(permission.alarmRechtePruefen(VideodetectionAndAccelerometerActivity.this, VideodetectionAndAccelerometerActivity.this)){
                     Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                        //todo AlarmHandling einfügen
-                    } else {
-                        permission.alarmRechteAnfordern(VideodetectionAndAccelerometerActivity.this);
-                        if(permission.alarmRechtePruefen(VideodetectionAndAccelerometerActivity.this, VideodetectionAndAccelerometerActivity.this)){
-                            Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Start Alarm Recording", Toast.LENGTH_LONG).show();
-                            //todo Alarmhandling einfügen
-                        } else {
-                            Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
-                        }
-                    }
                 }
                 else {
                     Toast.makeText(VideodetectionAndAccelerometerActivity.this, "Stop Alarm Recording", Toast.LENGTH_LONG).show();
@@ -113,19 +101,12 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    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, "VideoAndAccelerometer", 0);
+                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
                 }
+
             }
         });
 

app/src/main/java/com/example/greenwatch/communication/WiFiCommunication.java

@@ -1,5 +1,7 @@
 package com.example.greenwatch.communication;
 
+import android.util.Log;
+
 import com.example.greenwatch.repositories.DeviceRepository;
 
 import java.io.IOException;
@@ -56,23 +58,6 @@ 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();
@@ -89,7 +74,7 @@ public class WiFiCommunication {
                     {
                         isNewMessage = false;
                         //todo: adapt send String
-                        String txString = getLocalIpAddress() + " sends. #" + tmpCnt++ + sendMessage;
+                        String txString = 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,14 +1,21 @@
 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;
@@ -76,11 +83,12 @@ public class DeviceRepository {
 
     public void getNewReceivedMessage(String newMessage) {
         String[] messageString = messageStringSplitter(newMessage);
-        String timeStamp = messageString[0];
+        if(messageString[0]=="1" && messageString.length == 7){
-        String deviceID = messageString[1];
+            String timeStamp = messageString[1];
-        boolean sensorStatus = convertSensorStatus(messageString[2]);
+            String deviceID = messageString[3];
-        String sensorType = messageString[3];
+            boolean sensorStatus = convertSensorStatus(messageString[4]);
-        int sensorMassage = Integer.valueOf(messageString[4]);
+            String sensorType = messageString[5];
+            int sensorMassage = Integer.valueOf(messageString[6]);
 
             if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
                 return;
@@ -93,14 +101,20 @@ public class DeviceRepository {
                 updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
             }
         }
+    }
 
     private String messageStringBuilder(String deviceID) {
         StringBuilder message = new StringBuilder();
         Device device = connectedDevicesList.get(deviceID);
         if(device != null) {
-            message.append(device.getTimeStamp())
+            message.append("1")
                     .append(delimiter)
-                    .append(device.getDeviceID())
+                    .append(device.getTimeStamp())
+                    .append(delimiter)
+                    .append("Gruppe3")
+                    .append(delimiter)
+                    //.append(device.getDeviceID())
+                    .append(getLocalIpAddress(deviceID))
                     .append(delimiter)
                     .append(device.getSensorStatus())
                     .append(delimiter)
@@ -117,6 +131,10 @@ public class DeviceRepository {
                     .append(delimiter)
                     .append("")
                     .append(delimiter)
+                    .append("")
+                    .append(delimiter)
+                    .append("")
+                    .append(delimiter)
                     .append("");
         }
         return message.toString();
@@ -319,4 +337,25 @@ 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/sensors/CameraSensor.java

@@ -3,7 +3,6 @@ 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;
@@ -19,18 +18,9 @@ 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;
@@ -69,7 +59,7 @@ public class CameraSensor {
 
                         if (previousHeight != 0) {
                             assert currentImage != null;
-                            isMotionDetected = compareFrames(currentImage);
+                            videoAlarmDetected = compareFrames(currentImage);
                         }
 
                         assert currentImage != null;
@@ -82,18 +72,6 @@ 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();
 
                     }
@@ -107,76 +85,36 @@ public class CameraSensor {
     }
 
     private boolean compareFrames(Image currentImage) {
-        Image.Plane[] planes = currentImage.getPlanes();
+
-        ByteBuffer currentBuffer = planes[0].getBuffer();
+        ByteBuffer currentBuffer = currentImage.getPlanes()[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;
         }
 
-        int blockSize = kleinstesQuadrat(previousHeight, previousWidth) / 8;
+        for (int row = 0; row < previousHeight; row++) {
+            for (int col = 0; col < previousWidth; col++) {
 
-        int numBlocksX = currentWidth / blockSize;
+                int previousIndex = row * previousWidth + col;
-        int numBlocksY = currentHeight / blockSize;
+                int currentIndex = row * currentWidth + col;
 
-        for (int blockY = 0; blockY < numBlocksY; blockY++) {
+                int previousPixel = previousBuffer.get(previousIndex) & 0xFF;
-            for (int blockX = 0; blockX < numBlocksX; blockX++) {
+                int currentPixel = currentBuffer.get(currentIndex) & 0xFF;
-                startX = blockX * blockSize;
-                startY = blockY * blockSize;
-                endX = startX + blockSize;
-                endY = startY + blockSize;
 
-                float currentLuminance = berechneMittlereLuminanz(currentBuffer, yRowStride, yPixelStride);
+                int pixelDifference = Math.abs(previousPixel - currentPixel);
-                float previousLuminance = berechneMittlereLuminanz(previousBuffer, yRowStride, yPixelStride);
+                int threshold = 120;
-
-                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/MicrofonHelperClasses/GleitenderMittelwert.java

@@ -1,23 +0,0 @@
-package com.example.greenwatch.sensors.MicrofonHelperClasses;
-
-public class GleitenderMittelwert {
-    private final float wichtungNeuerWert;
-    private final float wichtungAlterWert;
-    private float mittelwert = 0;
-
-    private boolean istMittelwertGesetzt = false;
-
-    public GleitenderMittelwert(float wichtungNeuerWert) {
-        this.wichtungNeuerWert = wichtungNeuerWert;
-        this.wichtungAlterWert = 1 - this.wichtungNeuerWert;
-    }
-
-    public 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/sensors/MicrofonHelperClasses/RingPuffer.java

@@ -1,38 +0,0 @@
-package com.example.greenwatch.sensors.MicrofonHelperClasses;
-
-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 short maximum() {
-        short max = 0;
-        for (int i = 0; i < anzahlEnthaltenerDaten; i++) {
-            if (puffer[i] > max) {
-                max = puffer[i];
-            }
-        }
-        return max;
-    }
-}

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

@@ -1,37 +0,0 @@
-package com.example.greenwatch.sensors.MicrofonHelperClasses;
-
-public class Verarbeitungsergebnis {
-    private String status;
-    private short maxAmp;
-    private float db;
-    //
-    public Verarbeitungsergebnis(String status, short maxAmp, int db) {
-        this.status = status;
-        this.maxAmp = maxAmp;
-        this.db = db;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public short getMaxAmp() {
-        return maxAmp;
-    }
-
-    public void setMaxAmp(short maxAmp) {
-        this.maxAmp = maxAmp;
-    }
-
-    public float getDB() {
-        return db;
-    }
-
-    public void setDB(float db) {
-        this.db = db;
-    }
-}

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

@@ -1,201 +0,0 @@
-package com.example.greenwatch.sensors;
-
-import android.media.AudioFormat;
-import android.media.AudioRecord;
-import android.media.MediaRecorder;
-import android.os.AsyncTask;
-
-import androidx.lifecycle.MutableLiveData;
-
-import com.example.greenwatch.sensors.MicrofonHelperClasses.GleitenderMittelwert;
-import com.example.greenwatch.sensors.MicrofonHelperClasses.RingPuffer;
-import com.example.greenwatch.sensors.MicrofonHelperClasses.Verarbeitungsergebnis;
-
- public class MicrofonSensor {
-
-     private MutableLiveData<Boolean> mMicrofonAlarmDetected = new MutableLiveData<>();
-     private AufnahmeTask aufnahmeTask;
-     private static MicrofonSensor microfonSensorInstance;
-     private boolean microfonAlarmDetected = false;
-     private boolean kalibrierung_do = true;
-     private float threshold = 40;
-     private float sensitivity = 10;
-
-     private float amplitudeInDB = 0;
-
-     private RingPuffer ringPuffer = new RingPuffer(10);
-
-     private MicrofonSensor() {
-     }
-
-     public static synchronized MicrofonSensor getInstance() {
-         if (microfonSensorInstance == null){
-             microfonSensorInstance = new MicrofonSensor();
-         }
-         return microfonSensorInstance;
-     }
-
-     public void start() {
-         aufnahmeTask = new AufnahmeTask();
-         aufnahmeTask.execute();
-     }
-
-     public void stop() {
-         if(aufnahmeTask !=null) {
-             aufnahmeTask.cancel(true);
-             aufnahmeTask = null;
-         }
-     }
-
-     public void doRecalibration() {
-         stop();
-         microfonAlarmDetected = false;
-         kalibrierung_do = true;
-         threshold = 40;
-         sensitivity = 10;
-         amplitudeInDB = 0;
-     }
-
-     public float getAmplitudeInDB() {
-         return amplitudeInDB;
-     }
-
-     private void setAmplitudeInDB(float amplitudeInDB) {
-         this.amplitudeInDB = amplitudeInDB;
-     }
-
-     public MutableLiveData<Boolean> getAccelerometerAlarmDetected() {
-         setMutableLiveDataMicrofonAlarmDetected();
-         return mMicrofonAlarmDetected;
-     }
-
-     private void setMutableLiveDataMicrofonAlarmDetected() {
-         mMicrofonAlarmDetected.setValue(microfonAlarmDetected);
-     }
-
-     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;
-         public AufnahmeTask() {
-             minPufferGroesseInBytes = AudioRecord.getMinBufferSize(sampleRateInHz, channelConfig, audioFormat);
-             pufferGroesseInBytes = minPufferGroesseInBytes * 2;
-             recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, sampleRateInHz, channelConfig, audioFormat, pufferGroesseInBytes);
-         }
-         public float kalibrieren(short[] puffer){
-             try {
-                 Thread.sleep(3000);
-
-             } catch (InterruptedException e) {
-                 e.printStackTrace();
-             }
-             int anzahlIterationen = 100;
-             float sum = 0.0f;
-             for(int i = 0; i < anzahlIterationen; i++){
-                 int z = recorder.read(puffer, 0, puffer.length);
-                 Verarbeitungsergebnis kalibrierung = verarbeiten(puffer, z);
-                 sum += kalibrierung.getDB();
-             }
-             return sum/anzahlIterationen;
-         }
-
-         public void Detektion(Verarbeitungsergebnis ergebnis){
-             if(ergebnis.getDB() >= (threshold+sensitivity)){
-                 microfonAlarmDetected = true;
-             }
-             else if (ergebnis.getDB() <= (threshold)) {
-                 microfonAlarmDetected = false;
-             }
-         }
-
-         @Override
-         protected Void doInBackground(Long... params) {
-
-             recorder.startRecording();
-             short[] puffer = new short[pufferGroesseInBytes / 2];
-             GleitenderMittelwert gleitenderMittelwertdB = new GleitenderMittelwert(0.2f);
-             float db = 0.0f;
-
-             //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 = ergebnis.getDB();
-                     db = gleitenderMittelwertdB.mittel(db);
-                     ergebnis.setDB(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);
-
-             setAmplitudeInDB(progress[0].getDB());
-
-             if (microfonAlarmDetected != mMicrofonAlarmDetected.getValue()){
-                 setMutableLiveDataMicrofonAlarmDetected();
-             }
-             //textViewMaxAmpdb.setText("" + progress[0].db);
-         }
-
-     }
-}
-

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

@@ -6,58 +6,86 @@ 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> mAccelerometerAlarmDetected;
+    private MutableLiveData<Boolean> mMovementDetected = new MutableLiveData<>();
     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 (mDeviceRepository == null) {
-            mDeviceRepository = DeviceRepository.getInstance();
-        }
-        if (mAccelerometerSensor == null) {
-            mAccelerometerSensor = AccelerometerSensor.getInstance();
-        }
         if (mDeviceList == null) {
+            mDeviceRepository = DeviceRepository.getInstance();
             mDeviceList = mDeviceRepository.getConnectedDeviceList();
-        }
-        if (mAlarmHistoryList == null) {
             mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
-        }
-        if (mStartAlarmRecording == null) {
             mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
         }
-        if (mAccelerometerAlarmDetected == null) {
+        initGesamtBE();
-            mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
+        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);
         }
     }
 
     public void addValueToGesamtBE(float newValue) {
-        mAccelerometerSensor.addValueToGesamtBE(newValue);
+        if (Gesamt_be.size() == arraySize) {
+            Gesamt_be.remove(Gesamt_be.size() -1);
+        }
+        Gesamt_be.add(0, newValue);
+        functionCallCount++;
     }
 
     public void meanValueCalculation() {
-        mAccelerometerSensor.meanValueCalculation();
+        for (float element : Gesamt_be) {
+            meanValue += Math.abs(element);
+        }
+        meanValue = meanValue/arraySize;
     }
 
     public void calibrateAccelerometerSensor() {
-        mAccelerometerSensor.calibrateAccelerometerSensor();
+        if (functionCallCount <= arraySize) {
+            offsetValue = meanValue;
+        }
+        else {
+            startMeasuring = true;
+        }
     }
 
     public void checkAlarmCondition() {
-        mAccelerometerSensor.checkAlarmCondition();
+        if (meanValue > (thresholdValue + offsetValue) && startMeasuring && !mMovementDetected.getValue()) {
+            mMovementDetected.setValue(true);
+        }
+        else if (meanValue < (thresholdValue + offsetValue) && mMovementDetected.getValue()){
+            mMovementDetected.setValue(false);
+        }
     }
 
-    public LiveData<Boolean> getAccelerometerAlarmDetected() {
+    public LiveData<Boolean> getMovementDetectedValue() {
-        return mAccelerometerAlarmDetected;
+        return mMovementDetected;
     }
 
     @Override

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

@@ -1,226 +0,0 @@
-package com.example.greenwatch.viewmodels;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModel;
-
-import com.example.greenwatch.models.Device;
-import com.example.greenwatch.repositories.DeviceRepository;
-import com.example.greenwatch.sensors.AccelerometerSensor;
-import com.example.greenwatch.sensors.MicrofonSensor;
-
-import java.util.List;
-
-public class AudiodetectionAndAccelerometerViewModel extends ViewModel implements ViewModelInterface {
-    private MutableLiveData<List<Device>> mDeviceList;
-    private MutableLiveData<Boolean> mAccelerometerAlarmDetected;
-    private MutableLiveData<Boolean> mMicrofonAlarmDetected;
-    private MutableLiveData<Boolean> mAudiodetectionAndAccelerometerAlarmDetected = new MutableLiveData<>();
-    private MutableLiveData<List<Device>> mAlarmHistoryList;
-    private MutableLiveData<Boolean> mStartAlarmRecording;
-    private AccelerometerSensor mAccelerometerSensor;
-    private MicrofonSensor mMicrofonSensor;
-    private DeviceRepository mDeviceRepository;
-    private boolean microfonAlarmDetected;
-    private boolean accelerometerAlarmDetected;
-    private boolean microfondetectionAndAccelerometerAlarmDetected;
-
-    @Override
-    public void init() {
-        if (mDeviceRepository == null) {
-            mDeviceRepository = DeviceRepository.getInstance();
-        }
-        if (mAccelerometerSensor == null) {
-            mAccelerometerSensor = AccelerometerSensor.getInstance();
-        }
-        if (mMicrofonSensor == null) {
-            mMicrofonSensor = MicrofonSensor.getInstance();
-        }
-        if (mDeviceList == null) {
-            mDeviceList = mDeviceRepository.getConnectedDeviceList();
-        }
-        if (mAlarmHistoryList == null) {
-            mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
-        }
-        if (mStartAlarmRecording == null) {
-            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
-        }
-        if (mAccelerometerAlarmDetected == null) {
-            mAccelerometerAlarmDetected = mAccelerometerSensor.getAccelerometerAlarmDetected();
-        }
-        if (mMicrofonAlarmDetected == null) {
-            mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
-        }
-        microfondetectionAndAccelerometerAlarmDetected = false;
-        accelerometerAlarmDetected = false;
-        microfonAlarmDetected = false;
-        registerAlarmObserver();
-    }
-
-    public void addValueToGesamtBE(float newValue) {
-        mAccelerometerSensor.addValueToGesamtBE(newValue);
-    }
-
-    public void meanValueCalculation() {
-        mAccelerometerSensor.meanValueCalculation();
-    }
-
-    public void calibrateAccelerometerSensor() {
-        mAccelerometerSensor.calibrateAccelerometerSensor();
-    }
-
-    public void checkAlarmCondition() {
-        mAccelerometerSensor.checkAlarmCondition();
-    }
-
-    public LiveData<Boolean> getAudiodetectionAndAccelerometerAlarmDetected() {
-        setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
-        return mAudiodetectionAndAccelerometerAlarmDetected;
-    }
-
-    public void startMicrofonSensor() {
-        mMicrofonSensor.start();
-    }
-
-    public void stopMicrofonSensor() {
-        mMicrofonSensor.stop();
-    }
-
-    public void recalibrationMicrofonSensor() {
-        mMicrofonSensor.doRecalibration();
-    }
-
-    public float getAmplitudeInDB() {
-        return mMicrofonSensor.getAmplitudeInDB();
-    }
-
-    private void setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected() {
-        mAudiodetectionAndAccelerometerAlarmDetected.setValue(microfondetectionAndAccelerometerAlarmDetected);
-    }
-
-    private void setAccelerometerAlarmDetected(boolean accelerometerAlarmDetected) {
-        this.accelerometerAlarmDetected = accelerometerAlarmDetected;
-    }
-
-    public boolean getAccelerometerAlarmDetected() {
-        return accelerometerAlarmDetected;
-    }
-
-    private void setMicrofonAlarmDetected(boolean microfonAlarmDetected) {
-        this.microfonAlarmDetected = microfonAlarmDetected;
-    }
-
-    public boolean getMicrofonAlarmDetected() {
-        return microfonAlarmDetected;
-    }
-
-    Observer<Boolean> observer = new Observer<Boolean>() {
-        @Override
-        public void onChanged(Boolean aBoolean) {
-            setAccelerometerAlarmDetected(mAccelerometerAlarmDetected.getValue());
-            setMicrofonAlarmDetected(mMicrofonAlarmDetected.getValue());
-            if (microfonAlarmDetected || accelerometerAlarmDetected) {
-                microfondetectionAndAccelerometerAlarmDetected = true;
-                setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
-
-            }
-            else if (!microfonAlarmDetected && !accelerometerAlarmDetected) {
-                microfondetectionAndAccelerometerAlarmDetected = false;
-                setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
-            }
-        }
-    };
-
-    private void registerAlarmObserver() {
-        mMicrofonAlarmDetected.observeForever(observer);
-        mAccelerometerAlarmDetected.observeForever(observer);
-    }
-
-    @Override
-    protected void onCleared() {
-        super.onCleared();
-        mMicrofonAlarmDetected.removeObserver(observer);
-        mAccelerometerAlarmDetected.removeObserver(observer);
-    }
-
-    @Override
-    public LiveData<List<Device>> getConnectedDeviceList() {
-        return mDeviceList;
-    }
-
-    @Override
-    public LiveData<List<Device>> getAlarmHistoryList() {
-        return mAlarmHistoryList;
-    }
-
-    @Override
-    public LiveData<Boolean> getStartAlarmRecording() {
-        return mStartAlarmRecording;
-    }
-
-    @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
-        mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
-    }
-
-    @Override
-    public void setTimeStamp(String deviceID, String timeStamp) {
-        mDeviceRepository.setTimeStamp(deviceID, timeStamp);
-    }
-
-    @Override
-    public String getTimeStamp(String deviceID) {
-        return mDeviceRepository.getTimeStamp(deviceID);
-    }
-
-    @Override
-    public void setDeviceID(String deviceID, String newDeviceID) {
-        mDeviceRepository.setDeviceID(deviceID, newDeviceID);
-    }
-
-    @Override
-    public String getDeviceID(String deviceID) {
-        return mDeviceRepository.getDeviceID(deviceID);
-    }
-
-    @Override
-    public void setSensorStatus(String deviceID, boolean sensorStatus) {
-        mDeviceRepository.setSensorStatus(deviceID, sensorStatus);
-    }
-
-    @Override
-    public boolean getSensorStatus(String deviceID) {
-        return mDeviceRepository.getSensorStatus(deviceID);
-    }
-
-    @Override
-    public void setSensorType(String deviceID, String sensorType) {
-        mDeviceRepository.setSensorType(deviceID, sensorType);
-    }
-
-    @Override
-    public String getSensorType(String deviceID) {
-        return mDeviceRepository.getSensorType(deviceID);
-    }
-
-    @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
-        mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
-    }
-
-    @Override
-    public int getSensorMassage(String deviceID) {
-        return mDeviceRepository.getSensorMassage(deviceID);
-    }
-
-    @Override
-    public String getLocalDeviceUUID() {
-        return mDeviceRepository.getLocalDeviceUUID();
-    }
-
-    @Override
-    public String getSystemTimeStamp() {
-        return mDeviceRepository.getSystemTimeStamp();
-    }
-}

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

@@ -1,6 +1,5 @@
 package com.example.greenwatch.viewmodels;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -23,6 +22,7 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
     private MutableLiveData<List<Device>> mAlarmHistoryList;
     private MutableLiveData<Boolean> mStartAlarmRecording;
     private DeviceRepository mDeviceRepository;
+    private static final int RIGHTS_REQUEST_CAMERA = 10;
 
     @Override
     public void init() {
@@ -41,6 +41,14 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
         mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
     }
 
+    public boolean isCameraAccessAllowed(Context context) {
+        return ContextCompat.checkSelfPermission(context, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    public void accessRequestCamera(Activity activity) {
+        ActivityCompat.requestPermissions(activity, new String[]{android.Manifest.permission.CAMERA}, RIGHTS_REQUEST_CAMERA);
+    }
+
     @Override
     public LiveData<List<Device>> getConnectedDeviceList() {
         return mDeviceList;

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

@@ -1,142 +0,0 @@
-package com.example.greenwatch.viewmodels;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-import com.example.greenwatch.models.Device;
-import com.example.greenwatch.repositories.DeviceRepository;
-import com.example.greenwatch.sensors.MicrofonSensor;
-
-import java.util.List;
-
-public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
-    private MutableLiveData<List<Device>> mDeviceList;
-    private MutableLiveData<Boolean> mMicrofonAlarmDetected;
-    private MutableLiveData<List<Device>> mAlarmHistoryList;
-    private MutableLiveData<Boolean> mStartAlarmRecording;
-    private MicrofonSensor mMicrofonSensor;
-    private DeviceRepository mDeviceRepository;
-
-    @Override
-    public void init() {
-        if (mDeviceRepository == null) {
-            mDeviceRepository = DeviceRepository.getInstance();
-        }
-        if (mMicrofonSensor == null) {
-            mMicrofonSensor = MicrofonSensor.getInstance();
-        }
-        if (mDeviceList == null) {
-            mDeviceList = mDeviceRepository.getConnectedDeviceList();
-        }
-        if (mAlarmHistoryList == null) {
-            mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
-        }
-        if (mStartAlarmRecording == null) {
-            mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
-        }
-        if (mMicrofonAlarmDetected == null) {
-            mMicrofonAlarmDetected = mMicrofonSensor.getAccelerometerAlarmDetected();
-        }
-    }
-
-    public void startMicrofonSensor() {
-        mMicrofonSensor.start();
-    }
-
-    public void stopMicrofonSensor() {
-        mMicrofonSensor.stop();
-    }
-
-    public void recalibrationMicrofonSensor() {
-        mMicrofonSensor.doRecalibration();
-    }
-
-    public float getAmplitudeInDB() {
-        return mMicrofonSensor.getAmplitudeInDB();
-    }
-
-    public LiveData<Boolean> getMicrofonAlarmDetected() {
-        return mMicrofonAlarmDetected;
-    }
-
-    @Override
-    public LiveData<List<Device>> getConnectedDeviceList() {
-        return mDeviceList;
-    }
-
-    @Override
-    public LiveData<List<Device>> getAlarmHistoryList() {
-        return mAlarmHistoryList;
-    }
-
-    @Override
-    public LiveData<Boolean> getStartAlarmRecording() {
-        return mStartAlarmRecording;
-    }
-
-    @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
-        mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
-    }
-
-    @Override
-    public void setTimeStamp(String deviceID, String timeStamp) {
-        mDeviceRepository.setTimeStamp(deviceID, timeStamp);
-    }
-
-    @Override
-    public String getTimeStamp(String deviceID) {
-        return mDeviceRepository.getTimeStamp(deviceID);
-    }
-
-    @Override
-    public void setDeviceID(String deviceID, String newDeviceID) {
-        mDeviceRepository.setDeviceID(deviceID, newDeviceID);
-    }
-
-    @Override
-    public String getDeviceID(String deviceID) {
-        return mDeviceRepository.getDeviceID(deviceID);
-    }
-
-    @Override
-    public void setSensorStatus(String deviceID, boolean sensorStatus) {
-        mDeviceRepository.setSensorStatus(deviceID, sensorStatus);
-    }
-
-    @Override
-    public boolean getSensorStatus(String deviceID) {
-        return mDeviceRepository.getSensorStatus(deviceID);
-    }
-
-    @Override
-    public void setSensorType(String deviceID, String sensorType) {
-        mDeviceRepository.setSensorType(deviceID, sensorType);
-    }
-
-    @Override
-    public String getSensorType(String deviceID) {
-        return mDeviceRepository.getSensorType(deviceID);
-    }
-
-    @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
-        mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
-    }
-
-    @Override
-    public int getSensorMassage(String deviceID) {
-        return mDeviceRepository.getSensorMassage(deviceID);
-    }
-
-    @Override
-    public String getLocalDeviceUUID() {
-        return mDeviceRepository.getLocalDeviceUUID();
-    }
-
-    @Override
-    public String getSystemTimeStamp() {
-        return mDeviceRepository.getSystemTimeStamp();
-    }
-}

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

@@ -26,9 +26,7 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
     private AccelerometerSensor mAccelerometerSensor;
     private CameraSensor mCameraSensor;
     private DeviceRepository mDeviceRepository;
-    private boolean videoAlarmDetected;
+    private boolean VideodetectionAndAccelerometerAlarmDetected;
-    private boolean accelerometerAlarmDetected;
-    private boolean videodetectionAndAccelerometerAlarmDetected;
 
     @Override
     public void init() {
@@ -56,9 +54,7 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
         if (mVideoAlarmDetected == null) {
             mVideoAlarmDetected = mCameraSensor.getVideoAlarmDetectedValue();
         }
-        videodetectionAndAccelerometerAlarmDetected = false;
+        VideodetectionAndAccelerometerAlarmDetected = false;
-        videoAlarmDetected = false;
-        accelerometerAlarmDetected = false;
         registerAlarmObserver();
     }
 
@@ -88,37 +84,19 @@ 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) {
-            setAccelerometerAlarmDetected(mAccelerometerAlarmDetected.getValue());
+            if (mVideoAlarmDetected.getValue() || mAccelerometerAlarmDetected.getValue() && !VideodetectionAndAccelerometerAlarmDetected) {
-            setVideoAlarmDetected(mVideoAlarmDetected.getValue());
+                VideodetectionAndAccelerometerAlarmDetected = true;
-            if (videoAlarmDetected || accelerometerAlarmDetected && !videodetectionAndAccelerometerAlarmDetected) {
-                videodetectionAndAccelerometerAlarmDetected = true;
                 setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
 
             }
-            else if (!videoAlarmDetected && !accelerometerAlarmDetected && videodetectionAndAccelerometerAlarmDetected) {
+            else if (!mVideoAlarmDetected.getValue() && !mAccelerometerAlarmDetected.getValue() && VideodetectionAndAccelerometerAlarmDetected) {
-                videodetectionAndAccelerometerAlarmDetected = false;
+                VideodetectionAndAccelerometerAlarmDetected = false;
                 setMutableLiveDataVideodetectionAndAccelerometerAlarmDetected();
             }
         }

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

@@ -12,7 +12,7 @@
         android:id="@+id/tvAudiodetectionStatusmessage"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="">
+        android:text="Audiodetection Activity">
     </TextView>
 
     <Button
@@ -22,27 +22,4 @@
         android:text="Back to MainActivity">
     </Button>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/deviceListRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/device_item"
-            android:layout_weight="1">
-        </androidx.recyclerview.widget.RecyclerView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/alarmHistoryListRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/alarm_history_item"
-            android:layout_weight="1">
-        </androidx.recyclerview.widget.RecyclerView>
-
-    </LinearLayout>
-
 </LinearLayout>

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

@@ -22,27 +22,4 @@
         android:text="Back to MainActivity">
     </Button>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/deviceListRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/device_item"
-            android:layout_weight="1">
-        </androidx.recyclerview.widget.RecyclerView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/alarmHistoryListRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            tools:listitem="@layout/alarm_history_item"
-            android:layout_weight="1">
-        </androidx.recyclerview.widget.RecyclerView>
-
-    </LinearLayout>
-
 </LinearLayout>