alartigu/ChatApp-AL-NM
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Phase de test TCP

Browse source
This commit is contained in:
Nabil Moukhlis 2020-12-10 17:37:28 +01:00
parent 41be85aebe
commit cc2a9cb729
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Implementation/src/MessageHorodate.java
View file

@ -44,11 +44,11 @@ public class MessageHorodate {
@Override
public String toString() {
String Msg = "";
Msg += ("Destinataire:" + this.getDestinataire() + "\n") ;
Msg += ("Source:" + this.getSource()+ "\n") ;
Msg += ("Type:"+ this.type+ "\n");
Msg += ("Date:" + this.dateToString() + "\n") ;
Msg += ("Message:" + this.getMessage() + "\n" );
Msg += ("Destinataire::" + this.getDestinataire() + "\n") ;
Msg += ("Source::" + this.getSource()+ "\n") ;
Msg += ("Type::"+ this.type+ "\n");
Msg += ("Date::" + this.dateToString() + "\n") ;
Msg += ("Message::" + this.getMessage() + "\n" );
return Msg ;
}
@ -73,13 +73,13 @@ public class MessageHorodate {
public static MessageHorodate stringToMessageHorodate(String s) {
String mots[] = s.split("\n");
Utilisateur destinataire = Utilisateur.stringToUtilisateur(mots[0].split(":")[1]);
Utilisateur source = Utilisateur.stringToUtilisateur(mots[1].split(":")[1]);
int type = Integer.parseInt(mots[2].split(":")[1]);
Utilisateur destinataire = Utilisateur.stringToUtilisateur(mots[0].split("::")[1]);
Utilisateur source = Utilisateur.stringToUtilisateur(mots[1].split("::")[1]);
int type = Integer.parseInt(mots[2].split("::")[1]);
DateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
Date date = new Date();
try {
date = format.parse(mots[3].split(":")[1]);
date = format.parse(mots[3].split("::")[1]);
} catch (ParseException e) {
e.printStackTrace();
}

16
Implementation/src/TCPEchange.java
View file

@ -177,7 +177,7 @@ class RunnerTCPEcoute implements Runnable {
while (line != null) {
if(line.split(":")[0].equals("Destinataire")) {
if(line.split("::")[0].equals("Destinataire")) {
if(msg.equals("")) {
dest = line+"\n";
msg=".";
@ -199,19 +199,19 @@ class RunnerTCPEcoute implements Runnable {
}
}
else if(line.split(":")[0].equals("Source")) {
else if(line.split("::")[0].equals("Source")) {
src = line+"\n";
if(!u2Initialise) {
u2=Utilisateur.stringToUtilisateur(src.split(":")[1].replaceAll("\n", ""));
u2=Utilisateur.stringToUtilisateur(src.split("::")[1].replaceAll("\n", ""));
System.out.println("u2Initialise !");
u2Initialise = true;
}
}
else if(line.split(":")[0].equals("Type")) {
if(line.split(":")[1].equals("2")) {
else if(line.split("::")[0].equals("Type")) {
if(line.split("::")[1].equals("2")) {
System.out.println("Bonjour recu!");
//System.out.println(src.split(":")[1].replaceAll("\n", ""));
u2=Utilisateur.stringToUtilisateur(src.split(":")[1].replaceAll("\n", ""));
//System.out.println(src.split("::")[1].replaceAll("\n", ""));
u2=Utilisateur.stringToUtilisateur(src.split("::")[1].replaceAll("\n", ""));
u2Initialise = true;
System.out.println("Pseudo du poto: >>"+u2.getPseudo()+"<<");
Thread t = new Thread(new RunnerTCPEnvoi(link,app,u2,true));
@ -220,7 +220,7 @@ class RunnerTCPEcoute implements Runnable {
}
type = line+"\n";
}
else if(line.split(":")[0].equals("Date")) {
else if(line.split("::")[0].equals("Date")) {
date = line+"\n";
}
else {