siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Version 2. working

Browse Source
This commit is contained in:
Miguel Siebenhaar 2023-06-21 15:28:57 +02:00
parent 8e002107b5
commit e571373fbb
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java
View File

@ -32,6 +32,8 @@ public class DetectorService extends LifecycleService {
String wifiData; String wifiData;
StringBuffer stringBufferWifi = new StringBuffer(); StringBuffer stringBufferWifi = new StringBuffer();
String typOfAlarm;
@Override @Override
public int onStartCommand(Intent intent, int flags, int startId) { public int onStartCommand(Intent intent, int flags, int startId) {
@ -50,6 +52,8 @@ public class DetectorService extends LifecycleService {
stringToStringbuffer(data); stringToStringbuffer(data);
Log.d("buffer",stringBufferWifi.toString()); Log.d("buffer",stringBufferWifi.toString());
passToServiceListener(stringBufferWifi); passToServiceListener(stringBufferWifi);
checkState(data);
checkTyp(data);
} }
}); });
@ -140,4 +144,23 @@ public class DetectorService extends LifecycleService {
stringBufferWifi.append(string).append("\n"); stringBufferWifi.append(string).append("\n");
} }
} }
public String[] splitString(String string){
String[] splitrxString = string.split(",");
return splitrxString; //splitrxString[0] = "1",splitrxString[1] = "HH:MM:SS", splitrxString[0].equals("1")
}
public boolean checkState(String string){
Log.d("state", String.valueOf(splitString(string)[4].equals("An")));
return splitString(string)[4].equals("An");
}
public String checkTyp(String string){
if (splitString(string)[5] != null) {
typOfAlarm = splitString(string)[5];
Log.d("Type", typOfAlarm);
}
return typOfAlarm;
}
} }

18
app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java
View File

@ -31,6 +31,8 @@ public class WifiCommunication {
private final DatagramSocket socket; private final DatagramSocket socket;
volatile private boolean running; volatile private boolean running;
private boolean Gruppe =true;
private OnConnectionListener listener; private OnConnectionListener listener;
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
public WifiCommunication(int port) { public WifiCommunication(int port) {
@ -66,7 +68,6 @@ public class WifiCommunication {
} }
private class ReceiveThread extends Thread { private class ReceiveThread extends Thread {
private StringBuffer rxStringBuffer = new StringBuffer();
private String rxString=""; private String rxString="";
private String previousRxString = ""; private String previousRxString = "";
@ -79,13 +80,16 @@ public class WifiCommunication {
socket.receive(rxPacket); socket.receive(rxPacket);
rxString = new String(receiveData, 0, rxPacket.getLength()); rxString = new String(receiveData, 0, rxPacket.getLength());
String[] splitrxString = rxString.split(","); String[] splitrxString = rxString.split(",");
if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7) { if(Gruppe){
//rxStringBuffer.append(rxString).append("\n"); if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7) {
Log.d("empfangen", rxString); //rxStringBuffer.append(rxString).append("\n");
sendWifiData(rxString); Log.d("empfangen", rxString);
//mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer)); sendWifiData(rxString);
previousRxString = rxString; //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer));
previousRxString = rxString;
}
} }
} while (running); } while (running);
} }
catch (IOException e) { catch (IOException e) {