Fin de la partie ajoue conversation avec le réseau
continuous-integration/drone/push Build is passing Details

peristanceBDD
Thomas Chazot 3 years ago
parent d016ed0589
commit 4851e6111d

@ -9,10 +9,11 @@ const io = new Server(server);
io.on('connection', (socket) => { io.on('connection', (socket) => {
console.log(socket.id) console.log(socket.id)
socket.on('signIn', (id) => {
});
socket.on('inConv', (conv) => { socket.on('inConv', (conv) => {
socket.join("C" + conv.id); socket.join("C" + conv.id);
console.log("C"+conv.id);
}); });
socket.on("messageSent", (conv) =>{ socket.on("messageSent", (conv) =>{
@ -20,6 +21,12 @@ io.on('connection', (socket) => {
console.log("Message envoyé"); console.log("Message envoyé");
}); });
socket.on("createConversation", (tabId) =>{
tabId.forEach(id => {
socket.to("U"+id).emit("messageReceived");
});
});
socket.on('inMatch', (match) => { socket.on('inMatch', (match) => {
socket.join("M" + match); socket.join("M" + match);
}); });

@ -1,4 +1,4 @@
const { io } = require("socket.io-client"); const { io } = require("socket.io-client");
export const socket = io("http://172.20.10.2:3000"); export const socket = io("http://172.27.168.231:3000");

@ -59,7 +59,7 @@ export default function AddConversation(props: {navigation:any}){
if (res!==null){ if (res!==null){
MANAGER_CONVERSATION.getTabConv().push(res); MANAGER_CONVERSATION.getTabConv().push(res);
setTabConv(MANAGER_CONVERSATION.getTabConv()); setTabConv(MANAGER_CONVERSATION.getTabConv());
socket.emit("messageSent", res); socket.emit("createConversation", tabId);
navigation.goBack(); navigation.goBack();
} }
}); });

@ -55,13 +55,10 @@ function SignIn(props: { navigation: any; }) {
if (res!=null){ if (res!=null){
MANAGER_USER.setCurrentUser(res); MANAGER_USER.setCurrentUser(res);
setUser(MANAGER_USER.getCurrentUser()); setUser(MANAGER_USER.getCurrentUser());
socket.emit("signIn", res);
await handleSkinLoad(); await handleSkinLoad();
await handleConversationLoad(); await handleConversationLoad();
await handleGameLoad(); await handleGameLoad();
MANAGER_CONVERSATION.getTabConv()?.forEach( conv =>{ initSocket();
socket.emit("inConv", conv);
});
socket.on("messageReceived", async () =>{ socket.on("messageReceived", async () =>{
await handleConversationLoad(); await handleConversationLoad();
@ -79,7 +76,15 @@ function SignIn(props: { navigation: any; }) {
return; return;
} }
function initSocket(){
socket.emit("signIn", MANAGER_USER.getCurrentUser()?.id);
MANAGER_CONVERSATION.getTabConv()?.forEach( conv =>{
socket.emit("inConv", conv);
});
socket.on("messageReceived", async () =>{
await handleConversationLoad();
});
}
async function handleConversationLoad(){ async function handleConversationLoad(){
const tmp = MANAGER_USER.getCurrentUser(); const tmp = MANAGER_USER.getCurrentUser();

Loading…
Cancel
Save