diff --git a/src/app/pages/jobactive/jobactive.page.ts b/src/app/pages/jobactive/jobactive.page.ts index 647d55c..edb1fd4 100644 --- a/src/app/pages/jobactive/jobactive.page.ts +++ b/src/app/pages/jobactive/jobactive.page.ts @@ -4,6 +4,7 @@ import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; import {Camera, CameraResultType, CameraSource} from "@capacitor/camera"; +import {SocketToolsService} from "../../services/socket-tools.service"; @Component({ selector: 'app-jobactive', @@ -18,17 +19,23 @@ export class JobactivePage implements OnInit { item_banner:string = 'default.jpg'; session_image_server:string=''; curr_session:string=''; + socket_room:string=''; constructor( private navctr: NavController, private router: Router, public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, + private socketToolsService: SocketToolsService, private loadingCtrl: LoadingController ) { this.jobData = this.router.getCurrentNavigation().extras.state; this.item_banner = this.jobData.banner; - //debugger; + this.socket_room = `${this.jobData.contract}-${this.jobData.contract_uid}`; + + // debugger; + // joinRoom(`${props.details.contract}-${props.details.contract_uid}`) + this.socketToolsService.joinSocketRoom(this.socket_room ); } @@ -114,7 +121,9 @@ export class JobactivePage implements OnInit { const event = new Event("app-taskactivities-refresh"); // Dispatch the event. dispatchEvent(event); - + //alert(this.socket_room); + // debugger; + this.socketToolsService.emmitSocketEvent("send_message",this.yourmessage, this.socket_room); } ); } diff --git a/src/app/services/socket-tools.service.ts b/src/app/services/socket-tools.service.ts index 9cc1264..89e4dbc 100644 --- a/src/app/services/socket-tools.service.ts +++ b/src/app/services/socket-tools.service.ts @@ -35,12 +35,19 @@ export class SocketToolsService { public joinSocketRoom(socketRoom){ this.socket.emit("join_room", socketRoom); } - public emmitSocketEvent(message, socketRoom){ - this.socket.emit("send_message", { message, socketRoom }); + public emmitSocketEvent(socketGroup, message, socketRoom){ + this.socket.emit(socketGroup, { message, socketRoom }); } private monitorConnection(): Observable { this.connectionSubject = new BehaviorSubject(false); + this.socket.on('receive_message', () => { + debugger; + const event = new Event("app-taskactivities-refresh"); + dispatchEvent(event); + }); + + this.socket.on('connect', () => { this.connectionSubject.next(true); });