diff --git a/config.xml b/config.xml index 8636e7231..9d64417cb 100644 --- a/config.xml +++ b/config.xml @@ -101,14 +101,14 @@ 1109370933 - 2677140979 + 2719981299 246097737 - 624868211 + 1779870382 diff --git a/package-lock.json b/package-lock.json index 50898f4dc..102fb5078 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2039,6 +2039,21 @@ } } }, + "@ionic-native/fcm": { + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@ionic-native/fcm/-/fcm-5.32.0.tgz", + "integrity": "sha512-6BU5cbxILHe3LmL82qwTl80BCaDzZvkd2svQm3CQgwBrBuzzccYd4iSqpdkHXyLkb49fIRa22r3apc7EJ72cFg==", + "requires": { + "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } + } + }, "@ionic-native/file": { "version": "5.31.1", "resolved": "https://registry.npmjs.org/@ionic-native/file/-/file-5.31.1.tgz", @@ -5745,6 +5760,15 @@ "integrity": "sha512-Jb3V72btxf3XHpkPQsGdyc8N6tVBYn1vsxSFj43fIz9vonJDUThYPCJJHqk6PX6N4dJw6I4FjxkpfCR4LDYMlw==", "dev": true }, + "cordova-plugin-fcm-with-dependecy-updated": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/cordova-plugin-fcm-with-dependecy-updated/-/cordova-plugin-fcm-with-dependecy-updated-7.8.0.tgz", + "integrity": "sha512-p2pbY1oqQ2UDbaWOWA2z84uMXmdDGYmK2O+mrufj1bZyoFodt7WqrtiB9oDnUuSSinMrdNFrupiWEDMSBSNVeQ==", + "dev": true, + "requires": { + "typescript": "^4.1.3" + } + }, "cordova-plugin-filepath": { "version": "1.5.8", "resolved": "https://registry.npmjs.org/cordova-plugin-filepath/-/cordova-plugin-filepath-1.5.8.tgz", @@ -6584,11 +6608,6 @@ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" }, - "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" - }, "default-gateway": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", @@ -7129,7 +7148,8 @@ "entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "dev": true }, "env-paths": { "version": "2.2.0", @@ -8357,11 +8377,6 @@ "minimalistic-assert": "^1.0.1" } }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" - }, "hex-color-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", @@ -8430,63 +8445,6 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, - "html-to-text": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-7.0.0.tgz", - "integrity": "sha512-UR/WMSHRN8m+L7qQUhbSoxylwBovNPS+xURn/pHeJvbnemhyMiuPYBTBGqB6s8ajAARN5jzKfF0d3CY86VANpA==", - "requires": { - "deepmerge": "^4.2.2", - "he": "^1.2.0", - "htmlparser2": "^6.0.0", - "minimist": "^1.2.5" - }, - "dependencies": { - "dom-serializer": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz", - "integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "entities": "^2.0.0" - } - }, - "domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" - }, - "domhandler": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.1.0.tgz", - "integrity": "sha512-/6/kmsGlMY4Tup/nGVutdrK9yQi4YjWVcVeoQmixpzjOUK1U7pQkvAPHBJeUxOgxF0J8f8lwCJSlCfD0V4CMGQ==", - "requires": { - "domelementtype": "^2.2.0" - } - }, - "domutils": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.5.1.tgz", - "integrity": "sha512-hO1XwHMGAthA/1KL7c83oip/6UWo3FlUNIuWiWKltoiQ5oCOiqths8KknvY2jpOohUoUgnwa/+Rm7UpwpSbY/Q==", - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.1.0" - } - }, - "htmlparser2": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.1.tgz", - "integrity": "sha512-GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.4.4", - "entities": "^2.0.0" - } - } - } - }, "htmlparser2": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", diff --git a/package.json b/package.json index 9d10e1521..58810689c 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "@fullcalendar/interaction": "^5.3.0", "@ionic-native/camera": "^5.31.1", "@ionic-native/core": "^5.0.7", + "@ionic-native/fcm": "^5.32.0", "@ionic-native/file": "^5.30.0", "@ionic-native/file-path": "^5.30.0", "@ionic-native/http": "^5.31.1", @@ -84,6 +85,7 @@ "cordova-plugin-androidx-adapter": "^1.1.3", "cordova-plugin-compat": "^1.2.0", "cordova-plugin-device": "^2.0.2", + "cordova-plugin-fcm-with-dependecy-updated": "^7.8.0", "cordova-plugin-inappbrowser": "^4.0.0", "cordova-plugin-ionic-keyboard": "^2.2.0", "cordova-plugin-ionic-webview": "^4.2.1", @@ -119,7 +121,15 @@ "cordova-plugin-mfp": {}, "cordova-plugin-mfp-push": {}, "cordova-plugin-androidx": {}, - "cordova-plugin-androidx-adapter": {} + "cordova-plugin-androidx-adapter": {}, + "cordova-plugin-fcm-with-dependecy-updated": { + "ANDROID_DEFAULT_NOTIFICATION_ICON": "@mipmap/ic_launcher", + "ANDROID_FCM_VERSION": "21.0.0", + "ANDROID_FIREBASE_BOM_VERSION": "26.0.0", + "ANDROID_GOOGLE_SERVICES_VERSION": "4.3.4", + "ANDROID_GRADLE_TOOLS_VERSION": "4.1.0", + "IOS_FIREBASE_MESSAGING_VERSION": "~> 7.4.0" + } }, "platforms": [ "browser", @@ -133,4 +143,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} \ No newline at end of file +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a1681cb40..4bd74f256 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -29,6 +29,8 @@ import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { MessagesPage } from './pages/chat/messages/messages.page'; +import { FCM } from '@ionic-native/fcm/ngx' + @NgModule({ declarations: [AppComponent,MessagesPage,], @@ -55,6 +57,7 @@ import { MessagesPage } from './pages/chat/messages/messages.page'; //File, WebView, FilePath, + FCM ], bootstrap: [AppComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index a038345a1..a3200840e 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -9,6 +9,8 @@ import { ModalController, AlertController } from '@ionic/angular'; /* import { Plugins, PushNotification, PushNotificationToken, PushNotificationActionPerformed, Modals } from '@capacitor/core'; */ import { Router } from '@angular/router'; +import { FCM } from '@ionic-native/fcm/ngx'; + /* const { PushNotifications, LocalNotifications, LocalNotificationAction } = Plugins; */ @Component({ @@ -116,15 +118,15 @@ export class HomePage implements OnInit { mobileFirstTest() { this.zone.run(() => { - alert("Hello MobileFirst"); - alert("Connecting to Server..."); + console.log("Hello MobileFirst"); + console.log("Connecting to Server..."); }); WLAuthorizationManager.obtainAccessToken("").then( (token) => { console.log('--> pingMFP(): Success ', token); this.zone.run(() => { - alert("Yay!"); - alert("Connected to MobileFirst Server"); + console.log("Yay!"); + console.log("Connected to MobileFirst Server"); }); var resourceRequest = new WLResourceRequest("/adapters/javaAdapter/resource/greet/", WLResourceRequest.GET @@ -134,19 +136,19 @@ export class HomePage implements OnInit { resourceRequest.send().then( (response) => { // Will display "Hello world" in an alert dialog. - alert("Success: " + response.responseText); + console.log("Success: " + response.responseText); this.MFPushNotification() }, (error) => { - alert("Failure: " + JSON.stringify(error)); + console.log("Failure: " + JSON.stringify(error)); } ); }, (error) => { - alert(JSON.stringify(error)) + console.log(JSON.stringify(error)) this.zone.run(() => { - alert("Bummer..."); - alert("Failed to connect to MobileFirst Server"); + console.log("Bummer..."); + console.log("Failed to connect to MobileFirst Server"); }); } ); @@ -155,7 +157,7 @@ export class HomePage implements OnInit { MFPushNotification() { var pushNotificationReceived = function (message) { - alert(JSON.stringify(message)); + console.log(JSON.stringify(message)); } MFPPush.initialize ( @@ -177,14 +179,14 @@ export class HomePage implements OnInit { ); MFPPush.registerDevice( null,function(successResponse) { - alert("Successfully registered: "+ successResponse); + console.log("Successfully registered: "+ successResponse); }, function(failureResponse) { - alert("Successfully registered: "+ failureResponse); + console.log("Successfully registered: "+ failureResponse); } ); function notificationReceived(message) { - alert(JSON.stringify(message.alert)); + console.log(JSON.stringify(message.alert)); } }