+
+
-
-
+ Return
+
+ Select to Invite
-
-
-
-
+
-
- {{ item.firstname }} {{ item.lastname }}
-
-
-
- Last seen : {{ item.last_login | date }}
-
-
+ {{ item.firstname }} {{ item.lastname }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/pages/familylogin/familylogin.page.ts b/src/app/pages/familylogin/familylogin.page.ts
index c122f57..38278b2 100644
--- a/src/app/pages/familylogin/familylogin.page.ts
+++ b/src/app/pages/familylogin/familylogin.page.ts
@@ -57,14 +57,18 @@ export class FamilyloginPage implements OnInit {
}
childJoinRoom:string = '';
+ privateFamilyChannel:string = '';
async joinLoginSockets(){
- this.childJoinRoom = "FAMILY-" + this.sessionDataProviderService.parent_uid;
- // debugger;
+ //this.childJoinRoom = "FAMILY-" + this.sessionDataProviderService.parent_uid;
+ this.childJoinRoom = this.sessionDataProviderService.getFamilyRoom();
+ this.privateFamilyChannel = this.sessionDataProviderService.getFamilyPrivateChannel();
+
this.socketToolsService.stop();
setTimeout(()=>{
this.socketToolsService.setupSocket("NO-NEED-SEND");
this.socketToolsService.joinSocketRoom("full-markets-jobs" );
- this.socketToolsService.joinSocketRoom(this.childJoinRoom)
+ this.socketToolsService.joinSocketRoom(this.childJoinRoom);
+ this.socketToolsService.joinSocketRoom(this.privateFamilyChannel);
}, 5000);
}
diff --git a/src/app/services/socket-tools.service.ts b/src/app/services/socket-tools.service.ts
index 76adbec..3d1f64f 100644
--- a/src/app/services/socket-tools.service.ts
+++ b/src/app/services/socket-tools.service.ts
@@ -3,12 +3,13 @@ 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'
+import {SessionDataProviderService} from "../store/session-data-provider.service";
@Injectable({
providedIn: 'root'
})
export class SocketToolsService {
- constructor(public marketDataService: MarketDataService ) {
+ constructor(public marketDataService: MarketDataService , public sessionDataProviderService:SessionDataProviderService) {
// this.setup('NO-NEED-FOR-NOW');
}
private socket: Socket;
@@ -24,7 +25,9 @@ export class SocketToolsService {
}
public familyInvite(item){
-
+ console.log(item);
+ let Vv = this.sessionDataProviderService.getFamilyRoom()+"-"+item.uid;
+ this.emmitSocketEvent("send_message",item, Vv);
}
public joinSocketRoom(socketRoom){
this.socket.emit("join_room", socketRoom);
diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts
index 9db122d..c69f8b9 100644
--- a/src/app/store/session-data-provider.service.ts
+++ b/src/app/store/session-data-provider.service.ts
@@ -144,6 +144,14 @@ export class SessionDataProviderService {
return arrY;
}
+ getFamilyRoom(){
+ return "FAMILY-" + this.parent_uid;
+ }
+
+ getFamilyPrivateChannel(){
+ return this.getFamilyRoom()+"-"+this.family_uid;
+ }
+
RefreshGlobalSessionData(loginResult: any){
this.account_type = loginResult.account_type;
this.firstname = loginResult.firstname;