config.xml

@@ -90,6 +90,5 @@
     <allow-navigation href="http://192.168.0.7:8100" />
     <plugin name="cordova-sqlite-storage" spec="^2.2.1" />
     <allow-navigation href="http://192.168.43.167:8100" />
-    <plugin name="cordova-plugin-x-socialsharing" spec="^5.3.2" />
-    <plugin name="uk.co.workingedge.phonegap.plugin.launchnavigator" spec="^4.2.0" />
+    <plugin name="cordova-plugin-local-notification" spec="^0.9.0-beta.2" />
 </widget>

package-lock.json

@@ -106,6 +106,16 @@
       "resolved": "https://registry.npmjs.org/@ionic-native/launch-navigator/-/launch-navigator-4.6.0.tgz",
       "integrity": "sha512-4BO2r/E1rnar+H/KIPbzBDwfsgUOVduFDfcU9Jx/bkB31FRbZKeW268jBFzZlPxOrg+hazmjs0w11ibgItDP9w=="
     },
+    "@ionic-native/local-notifications": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/local-notifications/-/local-notifications-4.7.0.tgz",
+      "integrity": "sha512-OVXpxF+JcHMvz11oKCEbJRLr/dlWQy/0HQYJMTk18cdevXVjju4IPazuhqTpTTxIXjBvTLHfUKu7rBO1ZJ8JRw=="
+    },
+    "@ionic-native/push": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/@ionic-native/push/-/push-4.7.0.tgz",
+      "integrity": "sha512-ynucoNm2Kg30rYAdgOv0h9oGGjVLz+AugL7O1/ng5piMFhC46O/eIUDJPTwkPqyM1USR/d99zbosttRo9aNgLg=="
+    },
     "@ionic-native/social-sharing": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/@ionic-native/social-sharing/-/social-sharing-4.6.0.tgz",
@@ -1329,6 +1339,11 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-actionsheet/-/cordova-plugin-actionsheet-2.3.3.tgz",
       "integrity": "sha1-6SYbLQBKjaQHOI1g31NMFWxS/xE="
     },
+    "cordova-plugin-badge": {
+      "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-badge/-/cordova-plugin-badge-0.8.7.tgz",
+      "integrity": "sha512-s+s4yusKdeJ4sMPhQs4zR3lR2UuROzSy14GFAp00pTHPiBfCtxeINSUYAZYnpuO3RGx6PPlVCwSJpVG0IdM58g=="
+    },
     "cordova-plugin-device": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.1.tgz",
@@ -1354,6 +1369,11 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-1.1.16.tgz",
       "integrity": "sha512-57EW4qNkKyCfcVt0pH11s88Dvwdtgf2UkbAyPNk2+T1cmLVQ503S/+3Wa3l173J0NGt/QGGyUM8Z66LkqTnoWg=="
     },
+    "cordova-plugin-local-notification": {
+      "version": "0.9.0-beta.2",
+      "resolved": "https://registry.npmjs.org/cordova-plugin-local-notification/-/cordova-plugin-local-notification-0.9.0-beta.2.tgz",
+      "integrity": "sha512-63n77K1pt8dnbWnNR8QWETi9Glezi1bvNHvHWmGNIOv0xCb0phZnm+Ku49BQ+omwe8Z5voMvrA4I03SYPpv38w=="
+    },
     "cordova-plugin-splashscreen": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.2.tgz",
@@ -1364,11 +1384,6 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
       "integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q="
     },
-    "cordova-plugin-x-socialsharing": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/cordova-plugin-x-socialsharing/-/cordova-plugin-x-socialsharing-5.3.2.tgz",
-      "integrity": "sha1-8SBYny+lB+kqMG8lypV7lvmWhrE="
-    },
     "cordova-sqlite-storage": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-2.2.1.tgz",
@@ -1757,11 +1772,6 @@
         "event-emitter": "0.3.5"
       }
     },
-    "es6-promise-plugin": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.2.2.tgz",
-      "integrity": "sha512-uoA4aVplXI9oqUYJFBAVRwAqIN9/n9JgrTAUGX3qPbnSZVE5yY1+6/MsoN5f4xsaPO62WjPHOdtts6okMN6tNA=="
-    },
     "es6-set": {
       "version": "0.1.5",
       "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
@@ -6264,11 +6274,6 @@
         }
       }
     },
-    "uk.co.workingedge.phonegap.plugin.launchnavigator": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/uk.co.workingedge.phonegap.plugin.launchnavigator/-/uk.co.workingedge.phonegap.plugin.launchnavigator-4.2.0.tgz",
-      "integrity": "sha1-B7NHCzOpwUAVivRigpauIkw0YaU="
-    },
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",

package.json

@@ -23,27 +23,28 @@
     "@ionic-native/core": "4.4.0",
     "@ionic-native/google-maps": "^4.5.3",
     "@ionic-native/launch-navigator": "^4.6.0",
+    "@ionic-native/local-notifications": "^4.7.0",
+    "@ionic-native/push": "^4.7.0",
     "@ionic-native/social-sharing": "^4.6.0",
     "@ionic-native/splash-screen": "4.4.0",
     "@ionic-native/status-bar": "4.4.0",
     "@ionic/storage": "^2.1.3",
     "cordova-android": "7.0.0",
     "cordova-plugin-actionsheet": "^2.3.3",
+    "cordova-plugin-badge": "^0.8.7",
     "cordova-plugin-device": "^2.0.1",
     "cordova-plugin-dialogs": "^2.0.1",
     "cordova-plugin-googlemaps": "^2.2.5",
     "cordova-plugin-ionic-keyboard": "^2.0.5",
     "cordova-plugin-ionic-webview": "^1.1.16",
+    "cordova-plugin-local-notification": "^0.9.0-beta.2",
     "cordova-plugin-splashscreen": "^5.0.2",
     "cordova-plugin-whitelist": "^1.3.3",
-    "cordova-plugin-x-socialsharing": "^5.3.2",
     "cordova-sqlite-storage": "^2.2.1",
-    "es6-promise-plugin": "^4.2.2",
     "ionic-angular": "3.9.2",
     "ionicons": "3.0.0",
     "rxjs": "5.5.2",
     "sw-toolbox": "3.6.0",
-    "uk.co.workingedge.phonegap.plugin.launchnavigator": "^4.2.0",
     "zone.js": "0.8.18"
   },
   "devDependencies": {
@@ -64,8 +65,7 @@
         "ANDROID_SUPPORT_V4_VERSION": "24.1.0"
       },
       "cordova-sqlite-storage": {},
-      "cordova-plugin-x-socialsharing": {},
-      "uk.co.workingedge.phonegap.plugin.launchnavigator": {}
+      "cordova-plugin-local-notification": {}
     },
     "platforms": [
       "android"

src/app/app.component.ts

@@ -3,9 +3,12 @@ import { Platform, Nav, AlertController } from 'ionic-angular';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
 import { Storage } from '@ionic/storage';
+import { VespotServiceProvider } from '../providers/vespot-service/vespot-service';
+import { ShareService } from '../services/share/share';
 
 import { HomePage } from '../pages/home/home';
 import { DevicesPage } from '../pages/devices/devices';
+import { Main } from '../pages/main/main';
 import { ConfigurationPage } from '../pages/configuration/configuration';
 
 @Component({
@@ -13,17 +16,44 @@ import { ConfigurationPage } from '../pages/configuration/configuration';
 })
 export class MyApp {
   @ViewChild(Nav) nav: Nav;
-  rootPage:any = HomePage;
+  //rootPage:any = HomePage;
 
-  constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen,
+  constructor(platform: Platform,
+    statusBar: StatusBar,
+    splashScreen: SplashScreen,
     private alertCtrl: AlertController,
-  private storage: Storage) {
+  private storage: Storage,
+  public vespotService: VespotServiceProvider,
+  public shareService: ShareService) {
     /*platform.ready().then(() => {
       // Okay, so the platform is ready and our plugins are available.
       // Here you can do any higher level native things you might need.
       statusBar.styleDefault();
       splashScreen.hide();
     });*/
+    this.storage.get('remember').then((val)=>{
+        if(val) {
+          this.storage.get('authentication').then((valAuth)=>{
+              this.authenticateUser(valAuth);
+          });
+        } else {
+              this.nav.setRoot(HomePage);
+        }
+    });
+  }
+
+  authenticateUser(auth) {
+    this.vespotService.getDevices(auth)
+  	.subscribe(
+        (data) => { // Success
+          this.shareService.setDevices(data);
+          this.shareService.setAuthToken(auth);
+          this.nav.setRoot(Main);
+        },
+        (error) =>{
+          this.nav.setRoot(HomePage);
+        }
+      );
   }
 
   openDevicesPage() {

src/app/app.module.ts

@@ -6,8 +6,6 @@ import { StatusBar } from '@ionic-native/status-bar';
 import { HttpClientModule } from '@angular/common/http';
 import { GoogleMaps } from '@ionic-native/google-maps';
 import { IonicStorageModule } from '@ionic/storage';
-import { LaunchNavigator, LaunchNavigatorOptions } from '@ionic-native/launch-navigator';
-import { SocialSharing } from '@ionic-native/social-sharing';
 
 import { MyApp } from './app.component';
 import { HomePage } from '../pages/home/home';
@@ -15,6 +13,7 @@ import { Main } from '../pages/main/main';
 import { DevicesPage } from '../pages/devices/devices';
 import { ConfigurationPage } from '../pages/configuration/configuration';
 import { VespotServiceProvider } from '../providers/vespot-service/vespot-service';
+import { VespotNotificationProvider } from '../providers/vespot-notification/vespot-notification';
 import { ShareService } from '../services/share/share';
 
 @NgModule({
@@ -45,9 +44,8 @@ import { ShareService } from '../services/share/share';
     GoogleMaps,
     {provide: ErrorHandler, useClass: IonicErrorHandler},
     VespotServiceProvider,
-    ShareService,
-    LaunchNavigator,
-    SocialSharing
+    VespotNotificationProvider,
+    ShareService
   ]
 })
 export class AppModule {}

src/pages/configuration/configuration.html

@@ -20,13 +20,24 @@
       <ion-toggle checked="false" [(ngModel)]="startAlarm" (ionChange)="changeAlarm()"></ion-toggle>
     </ion-item>
     <ion-item>
-      <ion-label>Tiempo Actualización</ion-label>
+      <ion-label>Actualización de mapa a los...</ion-label>
       <ion-select [(ngModel)]="time" (ionChange)="changeTime()">
         <ion-option value="15">15 seg</ion-option>
         <ion-option value="30" selected="true">30 seg</ion-option>
         <ion-option value="60">60 seg</ion-option>
       </ion-select>
     </ion-item>
+
+    <ion-item>
+      <ion-label>Alarma Activa a los...</ion-label>
+      <ion-select [(ngModel)]="activeAlarm" (ionChange)="changeActiveAlarm()">
+        <ion-option value="2">2 min</ion-option>
+        <ion-option value="5" selected="true">5 min</ion-option>
+        <ion-option value="10">10 min</ion-option>
+        <ion-option value="15">15 min</ion-option>
+      </ion-select>
+    </ion-item>
+
   </ion-list>
 
 </ion-content>

src/pages/configuration/configuration.ts

@@ -18,6 +18,7 @@ export class ConfigurationPage {
 
   startAlarm: any;
   time: any;
+  activeAlarm: any;
 
   constructor(public navCtrl: NavController,
     public navParams: NavParams,
@@ -41,4 +42,8 @@ export class ConfigurationPage {
     this.storage.set('time', this.time);
   }
 
+  changeActiveAlarm() {
+    this.storage.set('activeAlarm', this.activeAlarm);
+  }
+
 }

src/pages/home/home.ts

@@ -21,13 +21,13 @@ export class HomePage {
 		public vespotService: VespotServiceProvider,
     public shareService: ShareService,
     private storage: Storage) {
-      this.storage.get('remember').then((val)=>{
+      /*this.storage.get('remember').then((val)=>{
           if(val) {
             this.storage.get('authentication').then((valAuth)=>{
                 this.authenticateUser(valAuth);
             });
           }
-      });
+      });*/
   }
 
   /*ionViewCanEnter() {

src/pages/main/main.html

@@ -10,11 +10,7 @@
 <ion-content padding>
   <div id="map_canvas">
     <ion-fab right bottom>
-      <button ion-fab color="primary"><ion-icon name="car"></ion-icon></button>
-      <ion-fab-list side="left">
-        <button ion-fab><ion-icon name="map" (click)="shareViaMaps()"></ion-icon></button>
-        <button ion-fab><ion-icon name="logo-whatsapp" (click)="shareViaWhatsapp()"></ion-icon></button>
-      </ion-fab-list>
+      <button ion-fab color="primary" (click)="getPosition()"><ion-icon name="car"></ion-icon></button>
     </ion-fab>-
   </div>
 </ion-content>

src/pages/main/main.ts

@@ -3,8 +3,6 @@ import { NavController } from 'ionic-angular';
 import { AlertController } from 'ionic-angular';
 import { interval } from 'rxjs/observable/interval';
 import { Storage } from '@ionic/storage';
-import { LaunchNavigator, LaunchNavigatorOptions } from '@ionic-native/launch-navigator';
-import { SocialSharing } from '@ionic-native/social-sharing';
 
 import { DevicesPage } from '../devices/devices'
 import { ConfigurationPage } from '../configuration/configuration'
@@ -40,9 +38,7 @@ export class Main {
   private googleMaps: GoogleMaps,
   private vespotService: VespotServiceProvider,
   public alertCtrl: AlertController,
-  private storage: Storage,
-  private launchNavigator: LaunchNavigator,
-  private socialSharing: SocialSharing) {
+  private storage: Storage) {
       this.devicesPage = DevicesPage;
       this.configurationPage = ConfigurationPage;
       this.devices = this.shareService.getDevices();
@@ -51,8 +47,6 @@ export class Main {
 
   }
 
-
-
   ionViewWillEnter() {
     if(typeof this.shareService.getRootDevice() == "undefined") {
       console.log('ionViewWillEnter: Entro al undefined');
@@ -175,21 +169,4 @@ export class Main {
         );
   }
 
-  shareViaMaps() {
-    let options: LaunchNavigatorOptions = {
-      start: 'Bogota, ON'
-    };
-
-    this.launchNavigator.navigate([this.rootPosition.latitude, this.rootPosition.longitude], options)
-    .then(
-      success => console.log('Launched navigator'),
-      error => console.log('Error launching navigator', error)
-    );
-  }
-
-  shareViaWhatsarpp() {
-    //http://maps.google.com/maps?&z={INSERT_MAP_ZOOM}&mrt={INSERT_TYPE_OF_SEARCH}&t={INSERT_MAP_TYPE}&q={INSERT_MAP_LAT_COORDINATES}+{INSERT_MAP_LONG_COORDINATES}
-    this.socialSharing.share('Posición de mi dispositivo', '', null, 'http://maps.google.com/maps?&z=15&mrt=yp&t=k&q=27.9879012+86.9253141')
-  }
-
 }

src/providers/vespot-service/vespot-service.ts

@@ -31,5 +31,9 @@ export class VespotServiceProvider {
 
   getPositionByDeviceId(auth, deviceId) {
     return this.http.get(this.URL + '/positions/lastdeviceposition?deviceId=' + deviceId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + auth)});
+  }
+
+	getDeviceLastEvent(auth, deviceId) {
+    return this.http.get(this.URL + '/events/lastevent?deviceId=' + deviceId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + auth)});
   }
 }