From a13f4e295b31e21a9674bd114407d04b9cfb28fd Mon Sep 17 00:00:00 2001
From: nutzma75019 <nutzma75019@th-nuernberg.de>
Date: Mon, 19 Jun 2023 23:23:27 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20in:=20messageStringBuilder:?=
 =?UTF-8?q?=20Hinzuf=C3=BCgen=20der=20Nachricht-ID=20(immer=201)=20und=20d?=
 =?UTF-8?q?er=20Gruppen-ID=20(immer=20Gruppe3)=20getNewReceivedMessage:=20?=
 =?UTF-8?q?Zuweisung=20der=20neuen=20Array-Felder=20von=20messageString=20?=
 =?UTF-8?q?an=20die=20jeweiligen=20Variablen,=20Einbinden=20der=20if-Bedin?=
 =?UTF-8?q?gung:=20nur=20die=20Funktion=20nach=20dem=20Message=20Split=20w?=
 =?UTF-8?q?eiter=20ausf=C3=BChren,=20wenn=20erstes=20Array-Feld=20=3D"1"?=
 =?UTF-8?q?=20und=20Array-L=C3=A4nge=3D7=20ist=20WICHTIG:=20Datentyp=20von?=
 =?UTF-8?q?=20sensorMassage=20(Zeile=2084)=20ist=20int=20-->=20zeigen=20wi?=
 =?UTF-8?q?r=20empfangenen=20float=20Wert=20als=20Int=20an=3F=20Gleiches?=
 =?UTF-8?q?=20in=20getSensorMassage-Funktion=20(Z.257)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/DeviceRepository.java        | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

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..cf39c10 100644
--- a/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java
+++ b/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java
@@ -76,21 +76,23 @@ public class DeviceRepository {
 
     public void getNewReceivedMessage(String newMessage) {
         String[] messageString = messageStringSplitter(newMessage);
-        String timeStamp = messageString[0];
-        String deviceID = messageString[1];
-        boolean sensorStatus = convertSensorStatus(messageString[2]);
-        String sensorType = messageString[3];
-        int sensorMassage = Integer.valueOf(messageString[4]);
+        if(messageString[0]=="1" && messageString.length == 7){
+            String timeStamp = messageString[1];
+            String deviceID = messageString[3];
+            boolean sensorStatus = convertSensorStatus(messageString[4]);
+            String sensorType = messageString[5];
+            int sensorMassage = Integer.valueOf(messageString[6]);
 
-        if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
-            return;
-        }
+            if (deviceID.equals(checkDeviceID(localDeviceUUID))) {
+                return;
+            }
 
-        if(!connectedDevicesList.containsKey(deviceID)) {
-            createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
-        }
-        else {
-            updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
+            if(!connectedDevicesList.containsKey(deviceID)) {
+                createNewDevice(timeStamp, deviceID, sensorStatus, sensorType, sensorMassage);
+            }
+            else {
+                updateDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
+            }
         }
     }
 
@@ -98,7 +100,11 @@ public class DeviceRepository {
         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)
@@ -117,6 +123,10 @@ public class DeviceRepository {
                     .append(delimiter)
                     .append("")
                     .append(delimiter)
+                    .append("")
+                    .append(delimiter)
+                    .append("")
+                    .append(delimiter)
                     .append("");
         }
         return message.toString();