adapted datahandling and communication strings

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

@@ -96,10 +96,10 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mAccelerometerViewModel.getAccelerometerSensorMeanValue());
                 }
                 else {
-                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
+                    mAccelerometerViewModel.updateDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0.0f);
                 }
 
             }

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

@@ -87,10 +87,10 @@ public class AudiodetectionActivity extends AppCompatActivity {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
+                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), true, "Audio", mMicrofonViewModel.getAmplitudeInDB());
                 }
                 else {
-                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB());
+                    mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Audio", 0.0f);
                 }
 
             }

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

@@ -94,18 +94,18 @@ public class AudiodetectionAndAccelerometerActivity extends AppCompatActivity im
                 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);
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mAudiodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
                     }
                     else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && !mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", (int) mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Audio", mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
                     }
                     else if (mAudiodetectionAndAccelerometerViewModel.getMicrofonAlarmDetected() && mAudiodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2AudioAndAccelerometer", 10);
+                        mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "AudioAndAccelerometer", mAudiodetectionAndAccelerometerViewModel.getAmplitudeInDB());
                     }
                 }
                 else {
                     Toast.makeText(AudiodetectionAndAccelerometerActivity.this, "onChangedFalse", Toast.LENGTH_LONG).show();
-                    mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "AudioAndAccelerometer", 0);
+                    mAudiodetectionAndAccelerometerViewModel.updateDevice(mAudiodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mAudiodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "AudioAndAccelerometer", 0.0f);
                 }
 
             }

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

@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.content.Intent;
+import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -138,30 +139,42 @@ public class MainActivity extends AppCompatActivity {
             }
         });
     }
-    public void openAudiodetectionActivity(){
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "No Sensor selected", 0.0f);
+    }
+
+    public void openAudiodetectionActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "Audio", 0.0f);
         Intent intent = new Intent(this, AudiodetectionActivity.class);
         startActivity(intent);
     }
-    public void openVideodetectionActivity(){
+    public void openVideodetectionActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "Video", 0.0f);
         Intent intent =  new Intent(this, VideodetectionActivity.class);
         startActivity(intent);
     }
-    public void openAccelerometerActivity(){
+    public void openAccelerometerActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "Accelerometer", 0.0f);
         Intent intent = new Intent(this, AccelerometerActivity.class);
         startActivity(intent);
     }
-    public void openAudiodetectionAndAccelerometerActivity(){
+    public void openAudiodetectionAndAccelerometerActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "AudioAndAccelerometer", 0.0f);
         Intent intent = new Intent(this, AudiodetectionAndAccelerometerActivity.class);
         startActivity(intent);
     }
-    public void openVideodetectionAndAccelerometerActivity(){
+    public void openVideodetectionAndAccelerometerActivity() {
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getSystemTimeStamp(),  false, "VideoAndAccelerometer", 0.0f);
         Intent intent = new Intent(this, VideodetectionAndAccelerometerActivity.class);
         startActivity(intent);
     }
     public void openConnectionActivity(){
         //Intent intent = new Intent(this, ConnectionActivity.class);
         //startActivity(intent);
-        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51",  true, "Audio", 10);
+        mMainActivityViewModel.updateDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51",  false, "Audio", 10);
     }
 
 }

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

@@ -88,10 +88,10 @@ public class VideodetectionActivity extends AppCompatActivity {
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), true, "Video", 10);
+                    mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), true, "Video", 1.0f);
                 }
                 else {
-                    mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), false, "Video", 0);
+                    mVideoDetectionViewModel.updateDevice(mVideoDetectionViewModel.getLocalDeviceUUID(), mVideoDetectionViewModel.getSystemTimeStamp(), false, "Video", 0.0f);
                 }
 
             }

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

@@ -102,17 +102,17 @@ public class VideodetectionAndAccelerometerActivity extends AppCompatActivity im
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
                     if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
-                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", mVideodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
                     }
                     else if (mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected() && !mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected()) {
-                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 10);
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "Video", 1.0f);
                     }
                     else if (mVideodetectionAndAccelerometerViewModel.getAccelerometerAlarmDetected() && mVideodetectionAndAccelerometerViewModel.getVideoAlarmDetected()) {
-                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "2VideoAndAccelerometer", 10);
+                        mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), true, "VideoAndAccelerometer", mVideodetectionAndAccelerometerViewModel.getAccelerometerSensorMeanValue());
                     }
                 }
                 else {
-                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0);
+                    mVideodetectionAndAccelerometerViewModel.updateDevice(mVideodetectionAndAccelerometerViewModel.getLocalDeviceUUID(), mVideodetectionAndAccelerometerViewModel.getSystemTimeStamp(), false, "VideoAndAccelerometer", 0.0f);
                 }
             }
         });

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

@@ -88,8 +88,7 @@ public class WiFiCommunication {
                     if(isNewMessage)
                     {
                         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/models/Device.java

@@ -7,9 +7,9 @@ public class Device {
     private String deviceID;
     private boolean sensorStatus;
     private String sensorType;
-    private int sensorMassage;
+    private float sensorMassage;
 
-    public Device(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public Device(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, float sensorMassage) {
         this.timeStamp = timeStamp;
         this.deviceID = deviceID;
         this.sensorStatus = sensorStatus;
@@ -47,11 +47,11 @@ public class Device {
         return sensorStatus;
     }
 
-    public void setSensorMassage(int sensorMassage) {
+    public void setSensorMassage(float sensorMassage) {
         this.sensorMassage = sensorMassage;
     }
 
-    public int getSensorMassage() {
+    public float getSensorMassage() {
         return sensorMassage;
     }
 }

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

@@ -60,7 +60,7 @@ public class DeviceRepository {
         return startAlarmRecording;
     }
 
-    public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage){
+    public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, float sensorMassage){
         Device newDevice = new Device(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
         if (sensorStatus) {
             setAlarmHistoryDeviceList(newDevice);
@@ -76,29 +76,34 @@ 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];
+            float sensorMassage = Float.valueOf(messageString[6]);
 
             if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
                 return;
             }
 
-        if(!connectedDevicesList.containsKey(deviceID)) {
+            if (!connectedDevicesList.containsKey(deviceID)) {
                 createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
-        }
+            } else {
-        else {
                 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.getTimeStamp())
+                    .append(delimiter)
+                    .append("Gruppe3")
                     .append(delimiter)
                     .append(device.getDeviceID())
                     .append(delimiter)
@@ -109,7 +114,11 @@ public class DeviceRepository {
                     .append(device.getSensorMassage());
         }
         else {
-            message.append("")
+            message.append("1")
+                    .append(delimiter)
+                    .append("")
+                    .append(delimiter)
+                    .append("Gruppe3")
                     .append(delimiter)
                     .append("")
                     .append(delimiter)
@@ -126,7 +135,7 @@ public class DeviceRepository {
         return localDeviceUUID;
     }
 
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         String checkedDeviceID = checkDeviceID(deviceID);
         Device device = connectedDevicesList.get(checkedDeviceID);
         if(device != null) {
@@ -234,7 +243,7 @@ public class DeviceRepository {
         return "";
     }
 
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         String checkedDeviceID = checkDeviceID(deviceID);
         Device device = connectedDevicesList.get(checkedDeviceID);
         if(device != null) {
@@ -244,7 +253,7 @@ public class DeviceRepository {
         }
     }
 
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         String checkedDeviceID = checkDeviceID(deviceID);
         Device device = connectedDevicesList.get(checkedDeviceID);
         if(device != null) {

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

@@ -82,4 +82,8 @@ public class AccelerometerSensor {
             mAccelerometerAlarmDetected.setValue(false);
         }
     }
+
+    public float getAccelerometerSensorMeanValue() {
+        return meanValue;
+    }
 }

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

@@ -56,6 +56,10 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
         mAccelerometerSensor.checkAlarmCondition();
     }
 
+    public float getAccelerometerSensorMeanValue() {
+        return mAccelerometerSensor.getAccelerometerSensorMeanValue();
+    }
+
     public LiveData<Boolean> getAccelerometerAlarmDetected() {
         return mAccelerometerAlarmDetected;
     }
@@ -76,7 +80,7 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
@@ -121,12 +125,12 @@ public class AccelerometerViewModel extends ViewModel implements ViewModelInterf
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

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

@@ -74,6 +74,10 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
         mAccelerometerSensor.checkAlarmCondition();
     }
 
+    public float getAccelerometerSensorMeanValue() {
+        return mAccelerometerSensor.getAccelerometerSensorMeanValue();
+    }
+
     public LiveData<Boolean> getAudiodetectionAndAccelerometerAlarmDetected() {
         setMutableLiveDataMicrofondetectionAndAccelerometerAlarmDetected();
         return mAudiodetectionAndAccelerometerAlarmDetected;
@@ -160,7 +164,7 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
@@ -205,12 +209,12 @@ public class AudiodetectionAndAccelerometerViewModel extends ViewModel implement
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

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

@@ -32,12 +32,12 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
         if(mDeviceList != null) {
             return;
         }
-        //todo: check if WiFi instanz can be hold only by the repository
         mDeviceRepository = DeviceRepository.getInstance();
         mWiFiCommunication = WiFiCommunication.getInstance();
         mDeviceRepository.setWiFiCommunication(mWiFiCommunication);
         mWiFiCommunication.setDeviceRepository(mDeviceRepository);
-        mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0);
+        mDeviceRepository.createNewDevice(mDeviceRepository.getSystemTimeStamp(), mDeviceRepository.getLocalDeviceUUID(), false, "No Sensor selected", 0.0f);
+        mDeviceRepository.setDeviceID(mDeviceRepository.getLocalDeviceUUID(), WiFiCommunication.getLocalIpAddress());
         mDeviceList = mDeviceRepository.getConnectedDeviceList();
         mAlarmHistoryList = mDeviceRepository.getAlarmHistoryDeviceList();
         mStartAlarmRecording = mDeviceRepository.getStartAlarmRecording();
@@ -75,7 +75,7 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
@@ -120,12 +120,12 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 
@@ -136,6 +136,6 @@ public class MainActivityViewModel extends ViewModel implements ViewModelInterfa
 
     @Override
     public String getSystemTimeStamp() {
-        return null;
+        return mDeviceRepository.getSystemTimeStamp();
     }
 }

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

@@ -76,7 +76,7 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
@@ -121,12 +121,12 @@ public class MicrofonViewModel extends ViewModel implements ViewModelInterface {
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

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

@@ -78,6 +78,10 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
         mAccelerometerSensor.checkAlarmCondition();
     }
 
+    public float getAccelerometerSensorMeanValue() {
+        return mAccelerometerSensor.getAccelerometerSensorMeanValue();
+    }
+
     public void bindImageAnalysis(ProcessCameraProvider cameraProvider, LifecycleOwner lifecycleOwner, Context context) {
         mCameraSensor.bindImageAnalysis(cameraProvider, lifecycleOwner, context);
     }
@@ -152,7 +156,7 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
@@ -197,12 +201,12 @@ public class VideodetectionAndAccelerometerViewModel extends ViewModel implement
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

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

@@ -74,7 +74,7 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
     }
 
     @Override
-    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) {
         mDeviceRepository.updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
@@ -119,12 +119,12 @@ public class VideodetectionViewModel extends ViewModel implements ViewModelInter
     }
 
     @Override
-    public void setSensorMassage(String deviceID, int sensorMessage) {
+    public void setSensorMassage(String deviceID, float sensorMessage) {
         mDeviceRepository.setSensorMassage(deviceID, sensorMessage);
     }
 
     @Override
-    public int getSensorMassage(String deviceID) {
+    public float getSensorMassage(String deviceID) {
         return mDeviceRepository.getSensorMassage(deviceID);
     }
 

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

@@ -11,7 +11,7 @@ public interface ViewModelInterface {
     LiveData<List<Device>> getConnectedDeviceList();
     LiveData<List<Device>> getAlarmHistoryList();
     LiveData<Boolean> getStartAlarmRecording();
-    void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage);
+    void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage);
     void setTimeStamp(String deviceID, String timeStamp);
     String getTimeStamp(String deviceID);
     void setDeviceID(String deviceID, String newDeviceID);
@@ -20,8 +20,8 @@ public interface ViewModelInterface {
     boolean getSensorStatus(String deviceID);
     void setSensorType(String deviceID, String sensorType);
     String getSensorType(String deviceID);
-    void setSensorMassage(String deviceID, int sensorMessage);
+    void setSensorMassage(String deviceID, float sensorMessage);
-    int getSensorMassage(String deviceID);
+    float getSensorMassage(String deviceID);
     String getLocalDeviceUUID();
     String getSystemTimeStamp();
 }

app/src/main/res/values/strings.xml

@@ -4,5 +4,5 @@
     <string name="sensor_status_placeholder">Sensorstatus: %s</string>
     <string name="deviceID_placeholder">Sensor-ID: %s</string>
     <string name="sensor_time_stamp_placeholder">Timestamp: %s</string>
-    <string name="sensor_message_placeholder">Sensormessage: %d</string>
+    <string name="sensor_message_placeholder">Sensormessage: %f</string>
 </resources>