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

Änderungen in:

Browse Source 
messageStringBuilder: Hinzufügen der Nachricht-ID (immer 1) und der Gruppen-ID (immer Gruppe3)
getNewReceivedMessage: Zuweisung der neuen Array-Felder von messageString an die jeweiligen Variablen, Einbinden der if-Bedingung: nur die Funktion nach dem Message Split weiter ausführen, wenn erstes Array-Feld ="1" und Array-Länge=7 ist
WICHTIG: Datentyp von sensorMassage (Zeile 84) ist int --> zeigen wir empfangenen float Wert als Int an? Gleiches in getSensorMassage-Funktion (Z.257)
This commit is contained in:
Maria Nutz 2023-06-19 23:23:27 +02:00
parent c57d277dfb
commit a13f4e295b
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,21 +76,23 @@ public class DeviceRepository {
public void getNewReceivedMessage(String newMessage) { public void getNewReceivedMessage(String newMessage) {
String[] messageString = messageStringSplitter(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))) { if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
return; return;
} }
if(!connectedDevicesList.containsKey(deviceID)) { if(!connectedDevicesList.containsKey(deviceID)) {
createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage); createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
} }
else { else {
updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage); updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
}
} }
} }
@ -98,7 +100,11 @@ 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(device.getTimeStamp()) message.append("1")
.append(delimiter)
.append(device.getTimeStamp())
.append(delimiter)
.append("Gruppe3")
.append(delimiter) .append(delimiter)
.append(device.getDeviceID()) .append(device.getDeviceID())
.append(delimiter) .append(delimiter)
@ -117,6 +123,10 @@ public class DeviceRepository {
.append(delimiter) .append(delimiter)
.append("") .append("")
.append(delimiter) .append(delimiter)
.append("")
.append(delimiter)
.append("")
.append(delimiter)
.append(""); .append("");
} }
return message.toString(); return message.toString();