fix socket in app
This commit is contained in:
@@ -2,13 +2,13 @@ import { Injectable } from '@angular/core';
|
||||
import { io, Socket } from 'socket.io-client';
|
||||
import { BehaviorSubject, Observable, Subject } from 'rxjs';
|
||||
import { environment } from 'src/environments/environment';
|
||||
|
||||
import { MarketDataService } from '../store/market-data.service'
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class SocketToolsService {
|
||||
|
||||
constructor() {
|
||||
constructor(public marketDataService: MarketDataService ) {
|
||||
// this.setup('NO-NEED-FOR-NOW');
|
||||
}
|
||||
private socket: Socket;
|
||||
@@ -18,50 +18,33 @@ export class SocketToolsService {
|
||||
private connectionSubject: Subject<boolean>;
|
||||
connected$: Observable<boolean>;
|
||||
setupSocket(authToken: string): void {
|
||||
// this.socket = io(environment.socketURL, {
|
||||
// path: '/chat/',
|
||||
// reconnection: true,
|
||||
// autoConnect: false,
|
||||
// extraHeaders: {
|
||||
// Authorization: 'Bearer ' + authToken
|
||||
// }
|
||||
// });
|
||||
|
||||
|
||||
this.socket = io(environment.socketURL,{autoConnect: false ,reconnection: true});
|
||||
this.connected$ = this.monitorConnection();
|
||||
this.socket.connect();
|
||||
|
||||
// this.connected$ = this.monitorConnection();
|
||||
//this.joinSocketRoom("full-markets-jobs")
|
||||
/*
|
||||
console.log("START JOIN DEFAULT ROOM ********* *** 001");
|
||||
this.joinSocketRoom("received_refreshmarket_jobs");
|
||||
console.log("END JOIN DEFAULT ROOM ********* *** 001");
|
||||
|
||||
|
||||
this.socket.on('receive_message', () => {
|
||||
console.log("app-taskactivities-refresh 001");
|
||||
const event = new Event("app-taskactivities-refresh");
|
||||
alert("app-taskactivities-refresh 000");
|
||||
dispatchEvent(event);
|
||||
console.log("app-taskactivities-refresh MOBILE *** 001");
|
||||
});
|
||||
|
||||
this.socket.on('received_refreshmarket_jobs', (data) => {
|
||||
console.log("received_refreshmarket_jobs 002");
|
||||
alert("received_refreshmarket_jobs 002");
|
||||
debugger
|
||||
console.log("received_refreshmarket_jobs MOBILE *** 002");
|
||||
});
|
||||
|
||||
|
||||
*/
|
||||
}
|
||||
|
||||
// useEffect(() => {
|
||||
// this.socket.on("receive_message", (data) => {
|
||||
// // setSocketMsgReceived(data.message);
|
||||
// //dispatch(tableReload({type:'CHATMESSAGELIST'}))
|
||||
// });
|
||||
// }, [this.socket]);
|
||||
|
||||
public joinSocketRoom(socketRoom){
|
||||
this.socket.emit("join_room", socketRoom);
|
||||
}
|
||||
public emmitSocketEvent(socketGroup, message, socketRoom){
|
||||
this.socket.emit(socketGroup, { message, socketRoom });
|
||||
this.socket.emit(socketGroup, { 'message':message, 'room': socketRoom });
|
||||
}
|
||||
private monitorConnection(): Observable<boolean> {
|
||||
console.log("********************* MONITORING-SOCKETS *******");
|
||||
@@ -69,19 +52,18 @@ export class SocketToolsService {
|
||||
this.connectionSubject = new BehaviorSubject<boolean>(false);
|
||||
|
||||
this.socket.on('receive_message', () => {
|
||||
console.log("app-taskactivities-refresh");
|
||||
console.log("app-taskactivities-refresh MOBILE APP ****");
|
||||
const event = new Event("app-taskactivities-refresh");
|
||||
dispatchEvent(event);
|
||||
});
|
||||
|
||||
this.socket.on('received_refreshmarket_jobs', (data) => {
|
||||
console.log("received_refreshmarket_jobs");
|
||||
// debugger
|
||||
// console.log("received_refreshmarket_jobs MOBILE APP****", data);
|
||||
this.marketDataService.socketRefreshJobsData(data);
|
||||
});
|
||||
|
||||
|
||||
this.socket.on('connect', () => {
|
||||
console.log("********************* MONITORING-SOCKETS ON CONNNECT *******");
|
||||
console.log("********************* MONITORING-SOCKETS ON CONNECT *******");
|
||||
// debugger;
|
||||
this.connectionSubject.next(true);
|
||||
});
|
||||
|
||||
@@ -144,7 +144,7 @@ export class WrenchService {
|
||||
|
||||
getBlogData(blogReq){
|
||||
//const blogReq=[];
|
||||
return this.getPostData('blogdata',blogReq);
|
||||
return this.getPostData('mobileblogdata',blogReq);
|
||||
//blogdata
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user