ajour de ping et suppretion commentaire et todo obselette

This commit is contained in:
marc barbier
2020-12-09 19:41:08 +01:00
parent 246dcc2487
commit 41d0061b79
7 changed files with 35 additions and 16 deletions
@@ -11,5 +11,6 @@ public final class COMMAND {
public static final String DEFEND = "defend";
public static final String CAST_SPELL = "castSpell";
public static final String PASS_TURN = "passTurn";
public static final String POPUP = "pupup";
}
@@ -7,6 +7,7 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.util.Log;
import android.view.MotionEvent;
import android.widget.Toast;
import androidx.fragment.app.DialogFragment;
@@ -20,6 +21,7 @@ import com.iutlaval.myapplication.Video.Drawables.Drawable;
import com.iutlaval.myapplication.Video.Drawables.DrawableBitmap;
import com.iutlaval.myapplication.Video.Drawables.DrawableCard;
import com.iutlaval.myapplication.Video.Drawables.DrawableSelfRemoving;
import com.iutlaval.myapplication.Video.Drawables.DrawableText;
import com.iutlaval.myapplication.Video.Renderer;
import java.io.IOException;
@@ -78,10 +80,8 @@ public class GameLogicThread extends Thread{
ready=true;
//TODO : choix du deck avant de se co au serv
final String host = "4.tcp.ngrok.io";//192.168.43.251tcp://2.tcp.ngrok.io:
final int port = 18240;
final int port = 14307;
try {
client = new Socket(host, port);
@@ -97,6 +97,8 @@ public class GameLogicThread extends Thread{
//principe de fonctionnement : on attends une comande du server et on l'execute
//si quelquechose se passe alors c'est le server qu'il l'a dit
while(ready && !cancelled)
{
try {
@@ -105,7 +107,6 @@ public class GameLogicThread extends Thread{
{
case COMMAND.GET_DECK:
clientOut.writeObject(deckName);
//TODO assing this deck
String deckstr = (String)clientIn.readObject();
deck = new NetworkDeck(deckstr,gameActivity.getBaseContext());
Log.e("got deck",deckstr);
@@ -147,6 +148,13 @@ public class GameLogicThread extends Thread{
case COMMAND.PASS_TURN:
//TODO pass turn
break;
case COMMAND.POPUP:
String recivedMessage = (String)clientIn.readObject();
Toast t = new Toast(gameActivity);
t.setText(recivedMessage);
t.setDuration(Toast.LENGTH_LONG);
t.show();
break;
default:
Log.e("UNKOWN COMMAND",serveurCmd);
}
@@ -243,3 +251,21 @@ public class GameLogicThread extends Thread{
}
}
/**
* ce thread a pour role de repondre pong au requette udp contenant ping
*
* cela sert a verifier sur le clien et présent sans blockage
*/
class UDPPingThread extends Thread
{
public UDPPingThread()
{
}
@Override
public void run() {
super.run();
}
}