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

Senden der Geräte-IP-Adresse (in Device Repository)

Browse Source 
Senden der zusammengesetzten Nachricht vom Message String Builder --> Teile der alten Testnachricht in WiFiCommunication entfernt
This commit is contained in:
Maria Nutz 2023-06-20 10:42:04 +02:00
parent a13f4e295b
commit 0423a56117
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/example/greenwatch/communication/WiFiCommunication.java
View File

@ -1,5 +1,7 @@
package com.example.greenwatch.communication; package com.example.greenwatch.communication;
import android.util.Log;
import com.example.greenwatch.repositories.DeviceRepository; import com.example.greenwatch.repositories.DeviceRepository;
import java.io.IOException; import java.io.IOException;
@ -56,23 +58,6 @@ public class WiFiCommunication {
this.isNewMessage = isNewMessage; this.isNewMessage = isNewMessage;
} }
public static String getLocalIpAddress() {
try {
for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
NetworkInterface networkInterface = (NetworkInterface) ((Enumeration<?>) en).nextElement();
for (Enumeration<InetAddress> addresses = networkInterface.getInetAddresses(); addresses.hasMoreElements();) {
InetAddress inetAddress = addresses.nextElement();
if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
return inetAddress.getHostAddress();
}
}
}
} catch (SocketException ex) {
ex.printStackTrace();
}
return null;
}
public void stopCommunication() { public void stopCommunication() {
running = false; running = false;
socket.close(); socket.close();
@ -89,7 +74,7 @@ public class WiFiCommunication {
{ {
isNewMessage = false; isNewMessage = false;
//todo: adapt send String //todo: adapt send String
String txString = getLocalIpAddress() + " sends. #" + tmpCnt++ + sendMessage; String txString = 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);

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

@ -1,14 +1,21 @@
package com.example.greenwatch.repositories; package com.example.greenwatch.repositories;
import android.util.Log;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import com.example.greenwatch.models.Device; import com.example.greenwatch.models.Device;
import com.example.greenwatch.communication.WiFiCommunication; import com.example.greenwatch.communication.WiFiCommunication;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ -106,7 +113,8 @@ public class DeviceRepository {
.append(delimiter) .append(delimiter)
.append("Gruppe3") .append("Gruppe3")
.append(delimiter) .append(delimiter)
.append(device.getDeviceID()) //.append(device.getDeviceID())
.append(getLocalIpAddress(deviceID))
.append(delimiter) .append(delimiter)
.append(device.getSensorStatus()) .append(device.getSensorStatus())
.append(delimiter) .append(delimiter)
@ -329,4 +337,25 @@ public class DeviceRepository {
} }
return false; return false;
} }
public String getLocalIpAddress(String deviceID) {
String checkedDeviceID = checkDeviceID(deviceID);
Device device = connectedDevicesList.get(checkedDeviceID);
if(device != null){
try {
for (Enumeration<NetworkInterface> en = NetworkInterface.getNetworkInterfaces(); en.hasMoreElements();) {
NetworkInterface networkInterface = (NetworkInterface) ((Enumeration<?>) en).nextElement();
for (Enumeration<InetAddress> addresses = networkInterface.getInetAddresses(); addresses.hasMoreElements();) {
InetAddress inetAddress = addresses.nextElement();
if (!inetAddress.isLoopbackAddress() && inetAddress instanceof Inet4Address) {
return inetAddress.getHostAddress();
}
}
}
} catch (SocketException ex) {
ex.printStackTrace();
}
}
return "";
}
} }