Compare commits

..

No commits in common. "cca1311b74223053a067931e2e19d33985a1aee0" and "ac971d3f0873220458c6c289e5a16e74c5fa7c54" have entirely different histories.

18 changed files with 70 additions and 107 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -88,7 +88,8 @@ public class WiFiCommunication {
if(isNewMessage) if(isNewMessage)
{ {
isNewMessage = false; isNewMessage = false;
String txString = sendMessage; //todo: adapt send String
String txString = getLocalIpAddress() + " sends. #" + tmpCnt++ + sendMessage;
byte[] txBuffer = txString.getBytes(); byte[] txBuffer = txString.getBytes();
DatagramPacket txPacket = new DatagramPacket(txBuffer, txBuffer.length, address, port); DatagramPacket txPacket = new DatagramPacket(txBuffer, txBuffer.length, address, port);

View File

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

View File

@ -60,7 +60,7 @@ public class DeviceRepository {
return startAlarmRecording; return startAlarmRecording;
} }
public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, float sensorMassage){ public void createNewDevice(String timeStamp, String deviceID, boolean sensorStatus, String sensorType, int sensorMassage){
Device newDevice = new Device(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage); Device newDevice = new Device(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
if (sensorStatus) { if (sensorStatus) {
setAlarmHistoryDeviceList(newDevice); setAlarmHistoryDeviceList(newDevice);
@ -76,12 +76,11 @@ public class DeviceRepository {
public void getNewReceivedMessage(String newMessage) { public void getNewReceivedMessage(String newMessage) {
String[] messageString = messageStringSplitter(newMessage); String[] messageString = messageStringSplitter(newMessage);
if(messageString[0]=="1" && messageString.length == 7) { String timeStamp = messageString[0];
String timeStamp = messageString[1]; String deviceID = messageString[1];
String deviceID = messageString[3]; boolean sensorStatus = convertSensorStatus(messageString[2]);
boolean sensorStatus = convertSensorStatus(messageString[4]); String sensorType = messageString[3];
String sensorType = messageString[5]; int sensorMassage = Integer.valueOf(messageString[4]);
float sensorMassage = Float.valueOf(messageString[6]);
if (deviceID.equals(checkDeviceID(localDeviceUUID))) { if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
return; return;
@ -89,9 +88,9 @@ public class DeviceRepository {
if(!connectedDevicesList.containsKey(deviceID)) { if(!connectedDevicesList.containsKey(deviceID)) {
createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage); createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
} else {
updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
} }
else {
updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
} }
} }
@ -99,11 +98,7 @@ public class DeviceRepository {
StringBuilder message = new StringBuilder(); StringBuilder message = new StringBuilder();
Device device = connectedDevicesList.get(deviceID); Device device = connectedDevicesList.get(deviceID);
if(device != null) { if(device != null) {
message.append("1") message.append(device.getTimeStamp())
.append(delimiter)
.append(device.getTimeStamp())
.append(delimiter)
.append("Gruppe3")
.append(delimiter) .append(delimiter)
.append(device.getDeviceID()) .append(device.getDeviceID())
.append(delimiter) .append(delimiter)
@ -114,11 +109,7 @@ public class DeviceRepository {
.append(device.getSensorMassage()); .append(device.getSensorMassage());
} }
else { else {
message.append("1") message.append("")
.append(delimiter)
.append("")
.append(delimiter)
.append("Gruppe3")
.append(delimiter) .append(delimiter)
.append("") .append("")
.append(delimiter) .append(delimiter)
@ -135,7 +126,7 @@ public class DeviceRepository {
return localDeviceUUID; return localDeviceUUID;
} }
public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, float sensorMassage) { public void updateDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
String checkedDeviceID = checkDeviceID(deviceID); String checkedDeviceID = checkDeviceID(deviceID);
Device device = connectedDevicesList.get(checkedDeviceID); Device device = connectedDevicesList.get(checkedDeviceID);
if(device != null) { if(device != null) {
@ -243,7 +234,7 @@ public class DeviceRepository {
return ""; return "";
} }
public void setSensorMassage(String deviceID, float sensorMessage) { public void setSensorMassage(String deviceID, int sensorMessage) {
String checkedDeviceID = checkDeviceID(deviceID); String checkedDeviceID = checkDeviceID(deviceID);
Device device = connectedDevicesList.get(checkedDeviceID); Device device = connectedDevicesList.get(checkedDeviceID);
if(device != null) { if(device != null) {
@ -253,7 +244,7 @@ public class DeviceRepository {
} }
} }
public float getSensorMassage(String deviceID) { public int getSensorMassage(String deviceID) {
String checkedDeviceID = checkDeviceID(deviceID); String checkedDeviceID = checkDeviceID(deviceID);
Device device = connectedDevicesList.get(checkedDeviceID); Device device = connectedDevicesList.get(checkedDeviceID);
if(device != null) { if(device != null) {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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