diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts
index 2219794f0..654e22656 100755
--- a/ng6-seed/src/app/dashboard/dashboard.component.ts
+++ b/ng6-seed/src/app/dashboard/dashboard.component.ts
@@ -361,15 +361,4 @@ getDoughnutChartData(){
})
}
-// openPlayer(){
-// let dialogRef = this.dialog.open(VideoPlayerComponent,{
-// maxWidth: '100vw',
-// maxHeight: '100vh',
-// height: '80%',
-// width: '80%',
-// disableClose: false,
-// panelClass:'video-player'
-// })
-// }
-
}
\ No newline at end of file
diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts
index 5bb1184c7..77b75f14e 100755
--- a/ng6-seed/src/app/layouts/admin/admin-layout.component.ts
+++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.ts
@@ -371,6 +371,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
console.log(data)
if(data == 'decline'){
this.incomingDialogOpened = false
+ this.socket.emit('callStatus',{random_string:curr_pd_info.random_string,status:'declined',status_code:3})
}
else {
this.incomingDialogOpened = false
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 1f35d296a..5fbe85637 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -146,8 +146,12 @@
+
-->
-
+
diff --git a/ng6-seed/src/app/video-chat/video-player/video-player.component.ts b/ng6-seed/src/app/video-chat/video-player/video-player.component.ts
index 16b1aa7c9..b99550dd7 100644
--- a/ng6-seed/src/app/video-chat/video-player/video-player.component.ts
+++ b/ng6-seed/src/app/video-chat/video-player/video-player.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
@Component({
selector: 'app-video-player',
@@ -7,13 +8,20 @@ import { Component, OnInit } from '@angular/core';
})
export class VideoPlayerComponent implements OnInit {
videoSrc
+ // = 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4'
// = 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerFun.mp4'
- constructor() { }
+ constructor( @Inject(MAT_DIALOG_DATA) public data:any,private matDialogRef:MatDialogRef) {
+ if(data) {
+ if(data.hasOwnProperty('videoUrl') && data.videoUrl && data.videoUrl != null) {
+ this.videoSrc = data.videoUrl
+ }
+ }
+ }
ngOnInit() {
let video_blob = localStorage.getItem('blob_url');
if(video_blob) {
- this.videoSrc = video_blob;
+ // this.videoSrc = video_blob;
console.log(this.videoSrc);
}
}
diff --git a/ng6-seed/src/assets/images/img/video-icon.png b/ng6-seed/src/assets/images/img/video-icon.png
new file mode 100644
index 000000000..3a0ed9287
Binary files /dev/null and b/ng6-seed/src/assets/images/img/video-icon.png differ