bauseweinfr74630/mMDT5_GreenWatch
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapted setDevice method

Browse Source
This commit is contained in:
Christian Tinz 2023-06-12 20:41:26 +02:00
parent ccdff78a4a
commit db74988f3d
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/example/greenwatch/AccelerometerActivity.java
View File

@ -75,10 +75,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.setDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), mAccelerometerViewModel.getLocalDeviceUUID(), true, "Accelerometer", 10); mAccelerometerViewModel.setDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
} }
else { else {
mAccelerometerViewModel.setDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), mAccelerometerViewModel.getLocalDeviceUUID(), false, "Accelerometer", 0); mAccelerometerViewModel.setDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
} }
} }

4
app/src/main/java/com/example/greenwatch/MainActivity.java
View File

@ -69,7 +69,7 @@ public class MainActivity extends AppCompatActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
//openAudiodetectionActivity(); //openAudiodetectionActivity();
mMainActivityViewModel.setDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51", "12345", false, "Audio", 10); mMainActivityViewModel.setDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51", false, "Audio", 10);
} }
}); });
videodetectionButton.setOnClickListener(new View.OnClickListener() { videodetectionButton.setOnClickListener(new View.OnClickListener() {
@ -78,7 +78,7 @@ public class MainActivity extends AppCompatActivity {
//openVideodetectionActivity(); //openVideodetectionActivity();
mMainActivityViewModel.setSensorType(mMainActivityViewModel.getLocalDeviceUUID(), "Video"); mMainActivityViewModel.setSensorType(mMainActivityViewModel.getLocalDeviceUUID(), "Video");
mMainActivityViewModel.setTimeStamp(mMainActivityViewModel.getLocalDeviceUUID(), "12:50"); mMainActivityViewModel.setTimeStamp(mMainActivityViewModel.getLocalDeviceUUID(), "12:50");
mMainActivityViewModel.setDeviceID(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getLocalDeviceUUID()); mMainActivityViewModel.setDeviceID(mMainActivityViewModel.getLocalDeviceUUID(), "12345");
} }
}); });
accelerometerButton.setOnClickListener(new View.OnClickListener() { accelerometerButton.setOnClickListener(new View.OnClickListener() {

7
app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java
View File

@ -73,18 +73,15 @@ public class DeviceRepository {
return deviceUUID; return deviceUUID;
} }
public void setDevice(String deviceID, String timeStamp, String newDeviceID, boolean sensorStatus, String sensorType, int sensorMassage) { public void setDevice(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) {
device.setTimeStamp(timeStamp); device.setTimeStamp(timeStamp);
device.setDeviceID(newDeviceID);
device.setSensorStatus(sensorStatus); device.setSensorStatus(sensorStatus);
device.setSensorType(sensorType); device.setSensorType(sensorType);
device.setSensorMassage(sensorMassage); device.setSensorMassage(sensorMassage);
setDeviceIDMapper(newDeviceID); addToConnectedDeviceList(checkedDeviceID, device);
connectedDevicesList.remove(checkedDeviceID);
addToConnectedDeviceList(newDeviceID, device);
setMutableLiveDataValue(); setMutableLiveDataValue();
} }
} }

4
app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java
View File

@ -93,8 +93,8 @@ public class AccelerometerViewModel extends ViewModel {
return mDeviceList; return mDeviceList;
} }
public void setDevice(String deviceID, String timeStamp, String newDeviceID, boolean sensorStatus, String sensorType, int sensorMassage) { public void setDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
mDeviceRepository.setDevice(deviceID, timeStamp,newDeviceID, sensorStatus, sensorType, sensorMassage); mDeviceRepository.setDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
} }
public void setTimeStamp(String deviceID, String timeStamp) { public void setTimeStamp(String deviceID, String timeStamp) {

4
app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java
View File

@ -27,8 +27,8 @@ public class MainActivityViewModel extends ViewModel {
return mDeviceList; return mDeviceList;
} }
public void setDevice(String deviceID, String timeStamp, String newDeviceID, boolean sensorStatus, String sensorType, int sensorMassage) { public void setDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
mDeviceRepository.setDevice(deviceID, timeStamp,newDeviceID, sensorStatus, sensorType, sensorMassage); mDeviceRepository.setDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
} }
public void setTimeStamp(String deviceID, String timeStamp) { public void setTimeStamp(String deviceID, String timeStamp) {