diff --git a/src/app/pages/familyconnectaction/familyconnectaction.page.html b/src/app/pages/familyconnectaction/familyconnectaction.page.html
index 372ac5e..1fd10ed 100644
--- a/src/app/pages/familyconnectaction/familyconnectaction.page.html
+++ b/src/app/pages/familyconnectaction/familyconnectaction.page.html
@@ -20,7 +20,11 @@
Chat
-
+
diff --git a/src/app/pages/familyconnectaction/familyconnectaction.page.ts b/src/app/pages/familyconnectaction/familyconnectaction.page.ts
index 69fa5a9..c952d67 100644
--- a/src/app/pages/familyconnectaction/familyconnectaction.page.ts
+++ b/src/app/pages/familyconnectaction/familyconnectaction.page.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit, ViewChild} from '@angular/core';
import {NavController} from "@ionic/angular";
import {SessionDataProviderService} from "../../store/session-data-provider.service";
import {WrenchService} from "../../services/wrench.service";
import {Router} from "@angular/router";
+import {SocketToolsService} from "../../services/socket-tools.service";
@Component({
selector: 'app-familyconnectaction',
@@ -11,14 +12,20 @@ import {Router} from "@angular/router";
})
export class FamilyconnectactionPage implements OnInit {
connnectionData:any;
+ @ViewChild('chat_message') chat_message;
constructor(
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService,
private router: Router,
- private navctr: NavController
+ private navctr: NavController,
+ public socketToolsService:SocketToolsService,
) {
this.connnectionData = this.router.getCurrentNavigation().extras.state;
console.log("CONNECTION DATA RECIEVED", this.connnectionData);
+ addEventListener('app-family-invite-message', (data:any) => {
+ console.log("ACCEPT CALL DATA MESSAGE ", data); //connectData
+ debugger;
+ });
}
ngOnInit() {
@@ -27,6 +34,11 @@ export class FamilyconnectactionPage implements OnInit {
this.navctr.back();
}
sendMessage(){
+ if (this.chat_message !=''){
+ this.socketToolsService.familyConnectMessage(this.connnectionData, this.chat_message );
+ }
+ }
+ testEntry(){
}
}
diff --git a/src/app/services/socket-tools.service.ts b/src/app/services/socket-tools.service.ts
index 244e19d..ce39cf5 100644
--- a/src/app/services/socket-tools.service.ts
+++ b/src/app/services/socket-tools.service.ts
@@ -24,18 +24,24 @@ export class SocketToolsService {
this.socket.connect();
}
+ public familyConnectMessage(item, chatMessage){
+ console.log(item);
+ const msgPart = {
+ type: 'FAMILY_INVITE_CONNECT_MESSAGE',
+ chat_message : chatMessage,
+ connectData: item
+ };
+ this.emmitSocketEvent("send_message",msgPart, item.target_room);
+ }
public familyInviteConnect(item){
console.log(item);
- debugger;
const msgPart = {
type: 'FAMILY_INVITE_CONNECT',
connectData: item
};
- let Vv = this.sessionDataProviderService.getFamilyRoom()+"-"+item.uid;
+ // let Vv = this.sessionDataProviderService.getFamilyRoom()+"-"+item.uid;
this.emmitSocketEvent("send_message",msgPart, item.target_room);
}
-
-
public familyInvite(item, activitySelect:string){
// console.log(item);
const msgPart = {
@@ -84,6 +90,14 @@ export class SocketToolsService {
}});
dispatchEvent(event_accept);
break;
+ case 'FAMILY_INVITE_CONNECT_MESSAGE':
+ console.log("app-family-invite accepted****");
+ const event_msg = new CustomEvent("app-family-invite-message", {detail: {
+ title: 'Invite Call Message',
+ data
+ }});
+ dispatchEvent(event_msg);
+ break;
}
}
else{