gallois/Clavardage
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

saveMessage integrated in new function (sendMsg)

Browse source
This commit is contained in:
Alexandre Gonzalvez 2020-12-16 07:48:51 +01:00
parent c9e317bd27
commit 5b1b1663db
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Application/Clavardage/src/controller/Controller.java
View file

@ -53,7 +53,8 @@ public class Controller {
* </p> * </p>
*/ */
private Controller(int portUDPsend,int portUDPlistening,int portTCP) { private Controller(int portUDPsend,int portUDPlistening,int portTCP) {
this.histoire=histoire; this.histoire= new Historique();
InetAddress addIP = null; InetAddress addIP = null;
try try
{ {
@ -352,11 +353,30 @@ public class Controller {
e.printStackTrace(); e.printStackTrace();
} }
DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); String message = (String) msg.getMessage(); // TODO check if instance of Msg_Text or anything else and threat it given a type
Date date = new Date();
out.println(dateFormat.format(date));
out.println(msg.getMessage()); // Date l'envoie du message
String dateString;
Date date;
Calendar date1=Calendar.getInstance();
date = new Date();
date1.setTime(date);
dateString=date1.toString();
/*
System.out.println(this.getHistory());
System.out.println(this.myUser.getPseudo());
System.out.println(c.getRemoteUser().getPseudo());
System.out.println(message);
System.out.println(dateString);
*/
// Sauvegarde dans la base de données
//this.getHistory().saveMessage(this.myUser, c.getRemoteUser(),message ,dateString);
// Envoie du message (avec la date)
DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
out.println(dateFormat.format(date));
out.println(message);
} }
// Plus utilisé // Plus utilisé
@ -397,6 +417,7 @@ public class Controller {
date=new Date(); date=new Date();
date1.setTime(date); date1.setTime(date);
dateString=date1.toString(); dateString=date1.toString();
this.getHistory().saveMessage(this.getMyUser(), getMyUser().getRemoteUsersList().get(index),input ,dateString ); this.getHistory().saveMessage(this.getMyUser(), getMyUser().getRemoteUsersList().get(index),input ,dateString );
} }
} catch (IOException e) { } catch (IOException e) {

11
Application/Clavardage/src/controller/ListeningThreadTCPChat.java
View file

@ -9,6 +9,7 @@ import java.io.PrintWriter;
import java.net.Socket; import java.net.Socket;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
public class ListeningThreadTCPChat extends ListeningThread{ public class ListeningThreadTCPChat extends ListeningThread{
@ -38,6 +39,12 @@ public class ListeningThreadTCPChat extends ListeningThread{
public void run() { public void run() {
BufferedReader in = null; BufferedReader in = null;
String msg = null; String msg = null;
String input;
String dateString;
Date date;
Calendar date1=Calendar.getInstance();
//RemoteUser rm; // TODO retrouver l'utilisateur distant
try { try {
System.out.println("("+this.controller.myUser.getPseudo()+") WAIT FOR NEW MESSAGE "); System.out.println("("+this.controller.myUser.getPseudo()+") WAIT FOR NEW MESSAGE ");
in =new BufferedReader(new InputStreamReader(this.socket.getInputStream())); in =new BufferedReader(new InputStreamReader(this.socket.getInputStream()));
@ -45,10 +52,12 @@ public class ListeningThreadTCPChat extends ListeningThread{
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
String input;
try { try {
while (!(input=in.readLine()).equals("end")) { while (!(input=in.readLine()).equals("end")) {
System.out.println("("+this.controller.myUser.getPseudo()+") recoit : "+input); System.out.println("("+this.controller.myUser.getPseudo()+") recoit : "+input);
// TODO save history (we have to choose to save it when message is receive or sent)
//this.controller.getHistory().saveMessage(this.controller.myUser, rm,input ,dateString );
} }
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block