From 27f9c0951659d84e615942ced9b37f1d2021e282 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Wed, 22 May 2024 21:02:38 +0530 Subject: [PATCH 1/2] Issue #ED-0000 fix: Fixed player issue --- src/app/player/player.page.html | 12 ++++++------ src/app/player/player.page.ts | 17 +++++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/app/player/player.page.html b/src/app/player/player.page.html index f530086eb4..1224b0b088 100644 --- a/src/app/player/player.page.html +++ b/src/app/player/player.page.html @@ -12,8 +12,8 @@ --> -
-
+
+
back
@@ -21,20 +21,20 @@
-
+
-
+ diff --git a/src/app/player/player.page.ts b/src/app/player/player.page.ts index 1f627f8ac8..93c5280271 100644 --- a/src/app/player/player.page.ts +++ b/src/app/player/player.page.ts @@ -68,10 +68,7 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat cardData: any; @ViewChild('preview', { static: false }) previewElement: ElementRef; - @ViewChild('video') video: ElementRef | undefined; - @ViewChild('pdf') pdf!: ElementRef; - @ViewChild('qumlPlayer', { static: false }) qumlPlayer: ElementRef; - @ViewChild('epub') epub: ElementRef; + @ViewChild('player') player: ElementRef; constructor( @Inject('COURSE_SERVICE') private courseService: CourseService, @@ -755,7 +752,7 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat this.playerTelemetryEvents(event.detail); }); - this.video?.nativeElement.append(videoElement); + this.player?.nativeElement.append(videoElement); }, 100); } } @@ -777,7 +774,7 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat epubElement.addEventListener('telemetryEvent', (event) => { console.log("On telemetryEvent", event); }); - this.epub.nativeElement.append(epubElement); + this.player.nativeElement.append(epubElement); }, 100); } @@ -798,12 +795,12 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat pdfElement.addEventListener('telemetryEvent', (event: any) => { this.playerTelemetryEvents(event.detail); }); - this.pdf.nativeElement.append(pdfElement); + this.player.nativeElement.append(pdfElement); }, 100); } async playQumlContent() { - if (this.playerType === 'sunbird-quml-player' && this.config && this.qumlPlayer) { + if (this.playerType === 'sunbird-quml-player' && this.config && this.player) { const playerConfig: any = { context: this.config.context, config: this.config.config, @@ -823,8 +820,8 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat console.log("On telemetryEvent", event); }); - if (this.qumlPlayer && this.qumlPlayer.nativeElement) { - this.qumlPlayer.nativeElement.append(qumlElement); + if (this.player && this.player.nativeElement) { + this.player.nativeElement.append(qumlElement); } else { console.error("qumlPlayer or its native element is not available."); } From b9e245a020b37a2e1fa55342471320e35f139ac3 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Thu, 23 May 2024 12:27:21 +0530 Subject: [PATCH 2/2] Issue #ED-0000 fix: Fixed player loading error --- package-lock.json | 131 ++++++++------------------------ package.json | 8 +- src/app/player/player.module.ts | 4 - tsconfig.json | 2 +- 4 files changed, 34 insertions(+), 111 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa67b63de5..9638939f05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,9 +62,7 @@ "@project-sunbird/sb-notification": "^8.0.0", "@project-sunbird/sb-styles": "0.0.16", "@project-sunbird/sb-svg2pdf": "^8.0.3", - "@project-sunbird/sunbird-epub-player-v9": "^5.6.0", "@project-sunbird/sunbird-epub-player-web-component": "^1.2.0", - "@project-sunbird/sunbird-pdf-player-v9": "^5.6.0", "@project-sunbird/sunbird-pdf-player-web-component": "^1.1.0", "@project-sunbird/sunbird-quml-player-web-component": "3.0.3", "@project-sunbird/sunbird-sdk": "7.0.23", @@ -86,7 +84,7 @@ "jest-preset-angular": "13.1.4", "jspdf": "^2.5.1", "jwt-decode": "^2.2.0", - "katex": "^0.11.1", + "katex": "^0.16.10", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "material-design-icons": "^3.0.1", @@ -128,7 +126,7 @@ "@babel/preset-typescript": "^7.9.0", "@ionic/angular-toolkit": "^6.0.0", "@project-sunbird/sb-themes": "0.0.86", - "@project-sunbird/telemetry-sdk": "0.0.29", + "@project-sunbird/telemetry-sdk": "^1.3.0", "@types/jest": "^28.0.3", "@types/lodash": "^4.14.180", "@types/node": "12.11.5", @@ -182,7 +180,7 @@ "cordova-plugin-zip": "^3.1.0", "cordova-sqlite-storage": "^6.0.0", "cordova-zip-plugin": "github:Sunbird-Ed/jjdltc-cordova-plugin-zip", - "cordova.plugins.diagnostic": "^5.0.2", + "cordova.plugins.diagnostic": "^7.1.4", "es6-promise-plugin": "^4.2.2", "fs-extra": "^8.1.0", "ionic-plugin-keyboard": "^2.2.1", @@ -9283,11 +9281,6 @@ "rxjs": ">=6" } }, - "node_modules/@project-sunbird/client-services/node_modules/@project-sunbird/telemetry-sdk": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/telemetry-sdk/-/telemetry-sdk-1.3.0.tgz", - "integrity": "sha512-9vocPJpB08/8pAXDUKQmhCiBxJ9qHxORF1+ot3kJczSnRh/K+POpAWDCR4iJ2+gWXPDE03WIWezshKpyf0RdYQ==" - }, "node_modules/@project-sunbird/client-services/node_modules/qs": { "version": "6.9.7", "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", @@ -10000,59 +9993,16 @@ "integrity": "sha512-+vlnoIbrgzAA+xicdebGDfyczRHpdJ3Zch7krm5ebaXkNOFiBimoRjxi2pkYe8NxoXNloMwICMJxi9pdFjJjsg==", "dev": true }, - "node_modules/@project-sunbird/sunbird-epub-player-v9": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-epub-player-v9/-/sunbird-epub-player-v9-5.6.0.tgz", - "integrity": "sha512-TP3CXN+eXonhOQl/zij1XUrb7LPBEf78J2dXYwLSxuNCSMUM5j1XuFfMsWjs5lobf9ZU6lUNEqLRYWcVh/CodA==", - "dependencies": { - "@project-sunbird/sunbird-player-sdk-v9": "5.1.0", - "tslib": "^2.0.0" - }, - "peerDependencies": { - "@angular/common": ">=14.2.12", - "@angular/core": ">=14.2.12", - "@project-sunbird/client-services": ">=3.4.8", - "@project-sunbird/sb-styles": ">=0.0.7" - } - }, "node_modules/@project-sunbird/sunbird-epub-player-web-component": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-epub-player-web-component/-/sunbird-epub-player-web-component-1.2.0.tgz", "integrity": "sha512-YeunsOyPIRkWkHqr6rGbYcjOKwTkNhrUzcSNMDh8oZ+E/LfyZ54eKtUzSR/+0wjvvOk4W8GFyG7SorSh93pAkw==" }, - "node_modules/@project-sunbird/sunbird-pdf-player-v9": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-pdf-player-v9/-/sunbird-pdf-player-v9-5.6.0.tgz", - "integrity": "sha512-pYYwCG8IRalTfxc1XpYPresB+HqmwgF6O3nORxeNfiNQTdW++/s1qvnXkk3cew4+Q4yN/hHkzXO7p3c5YNhm0g==", - "dependencies": { - "@project-sunbird/sunbird-player-sdk-v9": "5.1.0", - "tslib": "^2.0.0" - }, - "peerDependencies": { - "@angular/common": ">= 14.2.5", - "@angular/core": ">= 14.2.5", - "@project-sunbird/client-services": ">= 3.4.8", - "@project-sunbird/sb-styles": ">= 0.0.7" - } - }, "node_modules/@project-sunbird/sunbird-pdf-player-web-component": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-pdf-player-web-component/-/sunbird-pdf-player-web-component-1.1.0.tgz", "integrity": "sha512-upzGIRzRh8iOrkCFnmey/1DI9h9iyw110sXj6DluoobyonN0uXhrBwxk+oOiROGVAgm7hpTtrobGVzhGpEf40A==" }, - "node_modules/@project-sunbird/sunbird-player-sdk-v9": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v9/-/sunbird-player-sdk-v9-5.1.0.tgz", - "integrity": "sha512-Vg3MXOkBC7c1px9pTX58T0wqkseLAw0kWLflA8CpttIUQYFJBxxu5wEB8z8Y5zb6zDFrykxWRbPEcbdYdfOKRw==", - "dependencies": { - "ally.js": "1.4.1" - }, - "peerDependencies": { - "@angular/common": ">= 9.1.12", - "@angular/core": ">= 9.1.12", - "@project-sunbird/sb-styles": ">= 0.0.7" - } - }, "node_modules/@project-sunbird/sunbird-quml-player-web-component": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-quml-player-web-component/-/sunbird-quml-player-web-component-3.0.3.tgz", @@ -10144,14 +10094,9 @@ "integrity": "sha512-mYLHCYguwyNyMdc9Y8dgtPN1upu03MFS1htLPc1RuLDQ8ujHZDQCiasVurDlDVyBWEx+qxH7HeshQDngOfCHgA==" }, "node_modules/@project-sunbird/telemetry-sdk": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.29.tgz", - "integrity": "sha512-aFCBEikBdfAfA1bSwwlFmQvzbjd2BaK9JjJ01nGN5KnwkCGwduCngkAs0ns6S1X+o0/f3qyTUkL0NB/tKZ6Pjg==", - "dev": true, - "dependencies": { - "grunt-karma": "^0.12.2", - "karma": "^3.0.0" - } + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@project-sunbird/telemetry-sdk/-/telemetry-sdk-1.3.0.tgz", + "integrity": "sha512-9vocPJpB08/8pAXDUKQmhCiBxJ9qHxORF1+ot3kJczSnRh/K+POpAWDCR4iJ2+gWXPDE03WIWezshKpyf0RdYQ==" }, "node_modules/@scarf/scarf": { "version": "1.1.1", @@ -11399,15 +11344,6 @@ "ajv": "^8.8.2" } }, - "node_modules/ally.js": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/ally.js/-/ally.js-1.4.1.tgz", - "integrity": "sha512-ZewdfuwP6VewtMN36QY0gmiyvBfMnmEaNwbVu2nTS6zRt069viTgkYgaDiqu6vRJ1VJCriNqV0jGMu44R8zNbA==", - "dependencies": { - "css.escape": "^1.5.0", - "platform": "1.3.3" - } - }, "node_modules/android-versions": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.8.2.tgz", @@ -14699,30 +14635,21 @@ } }, "node_modules/cordova.plugins.diagnostic": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-5.0.2.tgz", - "integrity": "sha512-H59o7YxJ2/COzvg+jyTpUqX8QoDcvti9dluJ9a+pHumE8lf3meWemwCl0QFa9GH+xgVd6X1Ikj/6P3+DKWd9eg==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-7.1.4.tgz", + "integrity": "sha512-TMtxbe331ZyHJIYtvTmbFg5XEObuOHeoLYifhSAEcK4+RaBLzc4GhB6EkLq3I4Gb7khtB3km/5J6TsaVlAk3vQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "colors": "^1.1.2", + "colors": "1.4.0", "elementtree": "^0.1.6", - "minimist": "1.2.0" - }, - "engines": { - "cordovaDependencies": { - "4.0.0": { - "cordova": ">=7.1.0", - "cordova-android": ">=6.3.0", - "cordova-ios": ">=4.3.0" - } - } + "minimist": "1.2.6" } }, "node_modules/cordova.plugins.diagnostic/node_modules/minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "node_modules/core-js": { @@ -15153,11 +15080,6 @@ "url": "https://github.com/sponsors/fb55" } }, - "node_modules/css.escape": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", - "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==" - }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -25088,16 +25010,28 @@ } }, "node_modules/katex": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.11.1.tgz", - "integrity": "sha512-5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww==", + "version": "0.16.10", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz", + "integrity": "sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==", + "funding": [ + "https://opencollective.com/katex", + "https://github.com/sponsors/katex" + ], "dependencies": { - "commander": "^2.19.0" + "commander": "^8.3.0" }, "bin": { "katex": "cli.js" } }, + "node_modules/katex/node_modules/commander": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "engines": { + "node": ">= 12" + } + }, "node_modules/keycode": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", @@ -28320,11 +28254,6 @@ "node": ">= 0.4.0" } }, - "node_modules/platform": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz", - "integrity": "sha512-VJK1SRmXBpjwsB4YOHYSturx48rLKMzHgCqDH2ZDa6ZbMS/N5huoNqyQdK5Fj/xayu3fqbXckn5SeCS1EbMDZg==" - }, "node_modules/plist": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz", diff --git a/package.json b/package.json index 067cde2739..72a656c514 100644 --- a/package.json +++ b/package.json @@ -77,9 +77,7 @@ "@project-sunbird/sb-notification": "^8.0.0", "@project-sunbird/sb-styles": "0.0.16", "@project-sunbird/sb-svg2pdf": "^8.0.3", - "@project-sunbird/sunbird-epub-player-v9": "^5.6.0", "@project-sunbird/sunbird-epub-player-web-component": "^1.2.0", - "@project-sunbird/sunbird-pdf-player-v9": "^5.6.0", "@project-sunbird/sunbird-pdf-player-web-component": "^1.1.0", "@project-sunbird/sunbird-quml-player-web-component": "3.0.3", "@project-sunbird/sunbird-sdk": "7.0.23", @@ -101,7 +99,7 @@ "jest-preset-angular": "13.1.4", "jspdf": "^2.5.1", "jwt-decode": "^2.2.0", - "katex": "^0.11.1", + "katex": "^0.16.10", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "material-design-icons": "^3.0.1", @@ -155,7 +153,7 @@ "@babel/preset-typescript": "^7.9.0", "@ionic/angular-toolkit": "^6.0.0", "@project-sunbird/sb-themes": "0.0.86", - "@project-sunbird/telemetry-sdk": "0.0.29", + "@project-sunbird/telemetry-sdk": "^1.3.0", "@types/jest": "^28.0.3", "@types/lodash": "^4.14.180", "@types/node": "12.11.5", @@ -209,7 +207,7 @@ "cordova-plugin-zip": "^3.1.0", "cordova-sqlite-storage": "^6.0.0", "cordova-zip-plugin": "github:Sunbird-Ed/jjdltc-cordova-plugin-zip", - "cordova.plugins.diagnostic": "^5.0.2", + "cordova.plugins.diagnostic": "^7.1.4", "es6-promise-plugin": "^4.2.2", "fs-extra": "^8.1.0", "ionic-plugin-keyboard": "^2.2.1", diff --git a/src/app/player/player.module.ts b/src/app/player/player.module.ts index 83ff00d9fe..a9c5876854 100644 --- a/src/app/player/player.module.ts +++ b/src/app/player/player.module.ts @@ -8,8 +8,6 @@ import { IonicModule } from '@ionic/angular'; import { PlayerPage } from './player.page'; import { CanvasPlayerService } from '../../services/canvas-player.service'; import { ScreenOrientation } from '@awesome-cordova-plugins/screen-orientation/ngx'; -import { SunbirdPdfPlayerModule } from '@project-sunbird/sunbird-pdf-player-v9'; -import { SunbirdEpubPlayerModule } from '@project-sunbird/sunbird-epub-player-v9'; @@ -26,8 +24,6 @@ const routes: Routes = [ imports: [ CommonModule, FormsModule, - SunbirdPdfPlayerModule, - SunbirdEpubPlayerModule, IonicModule, RouterModule.forChild(routes) ], diff --git a/tsconfig.json b/tsconfig.json index 6acecc05e5..2c945e58f6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,7 @@ "allowSyntheticDefaultImports": true, "compileOnSave": false, "angularCompilerOptions": { - + "enableIvy": true, "fullTemplateTypeCheck": true, "strictInjectionParameters": true },