diff --git a/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java b/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java index ec863b2..2abe196 100644 --- a/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java +++ b/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); } } diff --git a/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java b/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java index 175df5c..cb43329 100644 --- a/app/src/main/java/com/example/greenwatch/AudiodetectionActivity.java +++ b/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, "Microfon", mMicrofonViewModel.getAmplitudeInDB()); } else { - mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", (int) mMicrofonViewModel.getAmplitudeInDB()); + mMicrofonViewModel.updateDevice(mMicrofonViewModel.getLocalDeviceUUID(), mMicrofonViewModel.getSystemTimeStamp(), false, "Microfon", mMicrofonViewModel.getAmplitudeInDB()); } } diff --git a/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java b/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java index 56d26a2..7b6a4ae 100644 --- a/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java +++ b/app/src/main/java/com/example/greenwatch/AudiodetectionAndAccelerometerActivity.java @@ -94,13 +94,13 @@ 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 { diff --git a/app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java b/app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java index 3cbdfa5..0b0435e 100644 --- a/app/src/main/java/com/example/greenwatch/VideodetectionAndAccelerometerActivity.java +++ b/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); } } }); diff --git a/app/src/main/java/com/example/greenwatch/models/Device.java b/app/src/main/java/com/example/greenwatch/models/Device.java index d9155e9..3a5ef1a 100644 --- a/app/src/main/java/com/example/greenwatch/models/Device.java +++ b/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; } } diff --git a/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java b/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java index 6df1250..c601337 100644 --- a/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java +++ b/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); @@ -80,7 +80,7 @@ public class DeviceRepository { String deviceID = messageString[1]; boolean sensorStatus = convertSensorStatus(messageString[2]); String sensorType = messageString[3]; - int sensorMassage = Integer.valueOf(messageString[4]); + float sensorMassage = Float.valueOf(messageString[4]); if (deviceID.equals(checkDeviceID(localDeviceUUID))) { return; @@ -126,7 +126,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 +234,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 +244,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) { diff --git a/app/src/main/java/com/example/greenwatch/sensors/AccelerometerSensor.java b/app/src/main/java/com/example/greenwatch/sensors/AccelerometerSensor.java index 70bc6a1..52ad5eb 100644 --- a/app/src/main/java/com/example/greenwatch/sensors/AccelerometerSensor.java +++ b/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; + } } diff --git a/app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java b/app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java index bc8fcff..94d1aa4 100644 --- a/app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java +++ b/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 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); } diff --git a/app/src/main/java/com/example/greenwatch/viewmodels/AudiodetectionAndAccelerometerViewModel.java b/app/src/main/java/com/example/greenwatch/viewmodels/AudiodetectionAndAccelerometerViewModel.java index 074ba2f..c5656d5 100644 --- a/app/src/main/java/com/example/greenwatch/viewmodels/AudiodetectionAndAccelerometerViewModel.java +++ b/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 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); } diff --git a/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java b/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java index a4446db..a737f07 100644 --- a/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java +++ b/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java @@ -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); } diff --git a/app/src/main/java/com/example/greenwatch/viewmodels/MicrofonViewModel.java b/app/src/main/java/com/example/greenwatch/viewmodels/MicrofonViewModel.java index 1a48e53..b428516 100644 --- a/app/src/main/java/com/example/greenwatch/viewmodels/MicrofonViewModel.java +++ b/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); } diff --git a/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionAndAccelerometerViewModel.java b/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionAndAccelerometerViewModel.java index ac290a8..2c0de60 100644 --- a/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionAndAccelerometerViewModel.java +++ b/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); } diff --git a/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionViewModel.java b/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionViewModel.java index 1a252c5..71ee0d2 100644 --- a/app/src/main/java/com/example/greenwatch/viewmodels/VideodetectionViewModel.java +++ b/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); } diff --git a/app/src/main/java/com/example/greenwatch/viewmodels/ViewModelInterface.java b/app/src/main/java/com/example/greenwatch/viewmodels/ViewModelInterface.java index eb290b4..e9bd65a 100644 --- a/app/src/main/java/com/example/greenwatch/viewmodels/ViewModelInterface.java +++ b/app/src/main/java/com/example/greenwatch/viewmodels/ViewModelInterface.java @@ -11,7 +11,7 @@ public interface ViewModelInterface { LiveData> getConnectedDeviceList(); LiveData> getAlarmHistoryList(); LiveData 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); - int getSensorMassage(String deviceID); + void setSensorMassage(String deviceID, float sensorMessage); + float getSensorMassage(String deviceID); String getLocalDeviceUUID(); String getSystemTimeStamp(); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c0c8d74..4bbef69 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,5 +4,5 @@ Sensorstatus: %s Sensor-ID: %s Timestamp: %s - Sensormessage: %d + Sensormessage: %f \ No newline at end of file