From 5f1f127e6221398a1f238a7351834ae2f9c6bee2 Mon Sep 17 00:00:00 2001 From: Miguel Siebenhaar Date: Wed, 21 Jun 2023 13:17:47 +0200 Subject: [PATCH] Kopie Master Version 1.2 UDP Socket merged with sensor --- .../Detection/DetectorService.java | 5 +++-- .../example/ueberwachungssystem/MainActivity.java | 11 ++--------- .../example/ueberwachungssystem/PopUpClass.java | 3 +-- .../ueberwachungssystem/WifiCommunication.java | 15 ++++++--------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java b/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java index f450e4f..e15f707 100644 --- a/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java +++ b/app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java @@ -29,7 +29,7 @@ public class DetectorService extends LifecycleService { WifiCommunication wifiCommunication; - StringBuffer dataFromWifi; + String dataFromWifi; @Override public int onStartCommand(Intent intent, int flags, int startId) { @@ -54,9 +54,10 @@ public class DetectorService extends LifecycleService { wifiCommunication = new WifiCommunication (1234); wifiCommunication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() { @Override - public void onConnection(StringBuffer data) { + public void onConnection(String data) { dataFromWifi = data; } + }); return super.onStartCommand(intent, flags, startId); } diff --git a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java index 776ed0b..8167fc3 100644 --- a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java +++ b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java @@ -42,7 +42,7 @@ public class MainActivity extends AppCompatActivity { button1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - communication.sendTrue(" Testmessage "); + communication.sendTrue("Testmessage"); } }); } @@ -53,7 +53,7 @@ public class MainActivity extends AppCompatActivity { communication = new WifiCommunication(1234); communication.setOnConnectionListener(new WifiCommunication.OnConnectionListener() { @Override - public void onConnection(StringBuffer data) { + public void onConnection(String data) { //Log.d("Test", data.toString()); runOnUiThread(new Runnable() { @Override @@ -101,12 +101,5 @@ public class MainActivity extends AppCompatActivity { return super.onOptionsItemSelected(item); } } - private String getLocalIpAddress() throws UnknownHostException { - WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE); - assert wifiManager != null; - WifiInfo wifiInfo = wifiManager.getConnectionInfo(); - int ipInt = wifiInfo.getIpAddress(); - return InetAddress.getByAddress(ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(ipInt).array()).getHostAddress(); - } } diff --git a/app/src/main/java/com/example/ueberwachungssystem/PopUpClass.java b/app/src/main/java/com/example/ueberwachungssystem/PopUpClass.java index 9b1990a..8b16912 100644 --- a/app/src/main/java/com/example/ueberwachungssystem/PopUpClass.java +++ b/app/src/main/java/com/example/ueberwachungssystem/PopUpClass.java @@ -50,8 +50,7 @@ public class PopUpClass { Button buttonEdit = popupView.findViewById(R.id.RechteAnfordern); buttonEdit.setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View v) { - RechteAnfordern(); + public void onClick(View v) {RechteAnfordern(); } }); diff --git a/app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java b/app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java index d22acbf..fc4c220 100644 --- a/app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java +++ b/app/src/main/java/com/example/ueberwachungssystem/WifiCommunication.java @@ -51,13 +51,13 @@ public class WifiCommunication { } public interface OnConnectionListener { - void onConnection(StringBuffer data); + void onConnection(String data); } public void setOnConnectionListener(@NonNull OnConnectionListener listener) { this.listener = listener; } - public void sendWifiData(StringBuffer wifiMessage) { + public void sendWifiData(String wifiMessage) { if (listener != null) { listener.onConnection(wifiMessage); } @@ -78,8 +78,8 @@ public class WifiCommunication { rxString = new String(receiveData, 0, rxPacket.getLength()); String[] splitrxString = rxString.split(","); if(!previousRxString.equals(rxString) && splitrxString[0].equals("1") && splitrxString.length==7) { - rxStringBuffer.append(rxString).append("\n"); - sendWifiData(rxStringBuffer); + //rxStringBuffer.append(rxString).append("\n"); + sendWifiData(rxString); //mainActivity.runOnUiThread(() -> mainActivity.tvMessages.setText(rxStringBuffer)); previousRxString = rxString; } @@ -99,16 +99,13 @@ public class WifiCommunication { if(send) { send = false; - SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); - Date curDate = new Date(System.currentTimeMillis()); - String str = formatter.format(curDate); byte[] send_Data = new byte[512]; - String txString = ("1," +str+ ",Gruppe2," + getLocalIpAddress() + ",An,Video," +messageToSend); + String txString = (messageToSend); send_Data = txString.getBytes(); DatagramPacket txPacket = new DatagramPacket(send_Data, txString.length(), address, port); - for(int i = 0; i < 300; i++) { + for(int i = 0; i < 500; i++) { socket.send(txPacket); } }