family connect
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
<ion-card-subtitle><div>You have an invitation waiting</div></ion-card-subtitle>
|
<ion-card-subtitle><div>You have an invitation waiting</div></ion-card-subtitle>
|
||||||
</ion-card-header>
|
</ion-card-header>
|
||||||
<ion-card-content>
|
<ion-card-content>
|
||||||
<ion-item lines="none" style="background-color: transparent; border-radius: 10px;">
|
<ion-item lines="none" style="background-color: transparent; border-radius: 10px;" (click)="acceptConnect(fromData)">
|
||||||
<ion-icon name="megaphone-outline" slot="start" color="danger"></ion-icon>
|
<ion-icon name="megaphone-outline" slot="start" color="danger"></ion-icon>
|
||||||
<ion-label>{{fromData.firstname}} is waiting...</ion-label>
|
<ion-label>{{fromData.firstname}} is waiting...</ion-label>
|
||||||
<ion-icon name="chevron-forward-outline" slot="end" color="secondary"></ion-icon>
|
<ion-icon name="chevron-forward-outline" slot="end" color="secondary"></ion-icon>
|
||||||
|
|||||||
@@ -45,12 +45,16 @@ connectStart : number = 0;
|
|||||||
//this.call_active = false;
|
//this.call_active = false;
|
||||||
}, 10000);
|
}, 10000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
acceptConnect(currentConnectData){
|
||||||
|
console.log(currentConnectData);
|
||||||
|
alert(100000);
|
||||||
|
}
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.getFamilyList();
|
this.getFamilyList();
|
||||||
}
|
}
|
||||||
|
|
||||||
startfamilyConnect(){
|
startfamilyConnect(){
|
||||||
// alert("start connect");
|
|
||||||
this.connectStart = 100;
|
this.connectStart = 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,8 +65,7 @@ connectStart : number = 0;
|
|||||||
}
|
}
|
||||||
|
|
||||||
sendInvite(){
|
sendInvite(){
|
||||||
console.log(this.select_activity);
|
this.socketToolsService.familyInvite(this.currentInvite,this.select_activity);
|
||||||
this.socketToolsService.familyInvite(this.currentInvite);
|
|
||||||
this.call_active = true;
|
this.call_active = true;
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
this.call_active = false;
|
this.call_active = false;
|
||||||
|
|||||||
@@ -24,15 +24,35 @@ export class SocketToolsService {
|
|||||||
this.socket.connect();
|
this.socket.connect();
|
||||||
}
|
}
|
||||||
|
|
||||||
public familyInvite(item){
|
public familyInviteConnect(item){
|
||||||
console.log(item);
|
console.log(item);
|
||||||
const msgPart = {
|
const msgPart = {
|
||||||
type: 'FAMILY_INVITE',
|
type: 'FAMILY_INVITE_CONNECT',
|
||||||
|
target_room: this.sessionDataProviderService.session+'-'+item.uid,
|
||||||
from: item
|
from: item
|
||||||
};
|
};
|
||||||
let Vv = this.sessionDataProviderService.getFamilyRoom()+"-"+item.uid;
|
let Vv = this.sessionDataProviderService.getFamilyRoom()+"-"+item.uid;
|
||||||
this.emmitSocketEvent("send_message",msgPart, Vv);
|
this.emmitSocketEvent("send_message",msgPart, Vv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public familyInvite(item, activitySelect:string){
|
||||||
|
// console.log(item);
|
||||||
|
const msgPart = {
|
||||||
|
type: 'FAMILY_INVITE',
|
||||||
|
activity: activitySelect,
|
||||||
|
target_room: this.sessionDataProviderService.session+'-'+item.uid,
|
||||||
|
from: item
|
||||||
|
};
|
||||||
|
let targetPrivateRoom = this.sessionDataProviderService.getFamilyRoom()+"-"+item.uid;
|
||||||
|
this.emmitSocketEvent("send_message",msgPart, targetPrivateRoom);
|
||||||
|
// note that target room is where we will chat or connect to talk
|
||||||
|
// after sending the message for invite , wait in the room
|
||||||
|
setTimeout(()=>{
|
||||||
|
this.joinSocketRoom( msgPart.target_room); // this is the room where we will talk or connect
|
||||||
|
}, 2000);
|
||||||
|
}
|
||||||
|
|
||||||
public joinSocketRoom(socketRoom){
|
public joinSocketRoom(socketRoom){
|
||||||
this.socket.emit("join_room", socketRoom);
|
this.socket.emit("join_room", socketRoom);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user