diff --git a/app/src/main/java/com/slprojects/pizzeria/MainActivity.java b/app/src/main/java/com/slprojects/pizzeria/MainActivity.java index f090909a6cfedb142baddf440bb5b609e937e736..5138fe721f1a455e5f3b3e6a81fff6609d5ff516 100644 --- a/app/src/main/java/com/slprojects/pizzeria/MainActivity.java +++ b/app/src/main/java/com/slprojects/pizzeria/MainActivity.java @@ -71,8 +71,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe // On réserve les espaces pour les commandes boutons.forEach((btn) -> numCommands.add(idIndexes.indexOf(btn.getId()), 0)); } - tacheDeFond = new backTasks(); - tacheDeFond.execute(); } @Override @@ -87,8 +85,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe numCommands.set(idIndexes.indexOf(v.getId()), numCommands.get(idIndexes.indexOf(v.getId()))+1); setButtonText(bouton); + String message = numTable+nomBoutons.get(idIndexes.indexOf(v.getId())); + tacheDeFond = new backTasks(); + tacheDeFond.execute(message); // Envoie de la commande - tacheDeFond.registerCommand(numTable+nomBoutons.get(idIndexes.indexOf(v.getId()))); + //tacheDeFond.registerCommand(numTable+nomBoutons.get(idIndexes.indexOf(v.getId()))); }catch ( Exception e ){ Log.e("Erreur", e.getMessage()); } diff --git a/app/src/main/java/com/slprojects/pizzeria/backTasks.java b/app/src/main/java/com/slprojects/pizzeria/backTasks.java index aae53bee131a3d6ad7e088290b149c7bdf48e884..c55e408f466673fa127fb2cb64b055823a6b55e4 100644 --- a/app/src/main/java/com/slprojects/pizzeria/backTasks.java +++ b/app/src/main/java/com/slprojects/pizzeria/backTasks.java @@ -9,31 +9,35 @@ import java.io.PrintWriter; import java.net.InetAddress; import java.net.Socket; -public class backTasks extends AsyncTask { +public class backTasks extends AsyncTask<String, Void, Void> { private Socket socket; private PrintWriter output; private BufferedReader input; @Override - protected Object doInBackground(Object[] objects) { + protected Void doInBackground(String... message) { int serverPort = 9874; String address = "chadok.info"; try { - InetAddress ipAddress = InetAddress.getByName(address); + //InetAddress ipAddress = InetAddress.getByName(address); Log.i("backTasks:", "Connecting to " + address + ":"+ serverPort + "..."); - socket = new Socket(ipAddress, serverPort); + socket = new Socket(address, serverPort); Log.i("backTasks:", "Connected"); output = new PrintWriter(socket.getOutputStream(), true); input = new BufferedReader(new InputStreamReader(socket.getInputStream())); + registerCommand(message[0]); + + /* while(true){ String message = input.readLine(); if (message != null){ Log.i("backTasks", "received message: " + message); } } + */ } catch (Exception x) { x.printStackTrace(); @@ -45,6 +49,7 @@ public class backTasks extends AsyncTask { if(output != null){ Log.i("backTasks", "registered command: "+command); output.write(command); + output.flush(); } }