Adds storage features

config.xml

@@ -88,4 +88,5 @@
         <variable name="ANDROID_SUPPORT_V4_VERSION" value="24.1.0" />
     </plugin>
     <allow-navigation href="http://192.168.0.7:8100" />
+    <plugin name="cordova-sqlite-storage" spec="^2.2.1" />
 </widget>

package-lock.json

@@ -1344,6 +1344,19 @@
       "resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
       "integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q="
     },
+    "cordova-sqlite-storage": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage/-/cordova-sqlite-storage-2.2.1.tgz",
+      "integrity": "sha512-NVaUtq5XDhbdV62lQiEEW/1WOyZYfNKKhEaFJZsvKsZ6461re4E85AvJCaPSo5dD91Qi/3WG5mwR/M1ixrfSww==",
+      "requires": {
+        "cordova-sqlite-storage-dependencies": "1.1.0"
+      }
+    },
+    "cordova-sqlite-storage-dependencies": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/cordova-sqlite-storage-dependencies/-/cordova-sqlite-storage-dependencies-1.1.0.tgz",
+      "integrity": "sha512-mtV0v6KuB7/9gfZdKiyBeFl1KPc/erMXMKAvnSFwszktm47HNmHJJ/05Fbc+YvQbccAXJ3QB/ElItWWqJorblg=="
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",

package.json

@@ -24,7 +24,7 @@
     "@ionic-native/google-maps": "^4.5.3",
     "@ionic-native/splash-screen": "4.4.0",
     "@ionic-native/status-bar": "4.4.0",
-    "@ionic/storage": "2.1.3",
+    "@ionic/storage": "^2.1.3",
     "cordova-android": "7.0.0",
     "cordova-plugin-device": "^2.0.1",
     "cordova-plugin-googlemaps": "^2.2.5",
@@ -32,6 +32,7 @@
     "cordova-plugin-ionic-webview": "^1.1.16",
     "cordova-plugin-splashscreen": "^5.0.2",
     "cordova-plugin-whitelist": "^1.3.3",
+    "cordova-sqlite-storage": "^2.2.1",
     "ionic-angular": "3.9.2",
     "ionicons": "3.0.0",
     "rxjs": "5.5.2",
@@ -54,7 +55,8 @@
         "API_KEY_FOR_ANDROID": "AIzaSyBFA53YiCYfP25i360xJ32gDDusW7zHrBk",
         "PLAY_SERVICES_VERSION": "11.8.0",
         "ANDROID_SUPPORT_V4_VERSION": "24.1.0"
-      }
+      },
+      "cordova-sqlite-storage": {}
     },
     "platforms": [
       "android"

src/app/app.module.ts

@@ -5,6 +5,7 @@ import { SplashScreen } from '@ionic-native/splash-screen';
 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 { MyApp } from './app.component';
 import { HomePage } from '../pages/home/home';
@@ -25,7 +26,8 @@ import { ShareService } from '../services/share/share';
   imports: [
     BrowserModule,
     HttpClientModule,
-    IonicModule.forRoot(MyApp)
+    IonicModule.forRoot(MyApp),
+    IonicStorageModule.forRoot()
   ],
   bootstrap: [IonicApp],
   entryComponents: [

src/pages/devices/devices.html

@@ -1,6 +1,6 @@
 <ion-header>
   <ion-navbar>
-    <ion-title>Selecciona tu dispositivo por defecto</ion-title>
+    <ion-title>Dispositivo por Defecto</ion-title>
   </ion-navbar>
 </ion-header>
 

src/pages/devices/devices.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { IonicPage, NavController} from 'ionic-angular';
+import { Storage } from '@ionic/storage';
 
 import { ShareService } from '../../services/share/share';
 
@@ -19,7 +20,9 @@ import { ShareService } from '../../services/share/share';
 export class DevicesPage {
 
   private devices;
-  constructor(public navCtrl: NavController, public shareService: ShareService) {
+  constructor(public navCtrl: NavController,
+    public shareService: ShareService,
+    private storage: Storage) {
     this.devices = this.shareService.getDevices();
     //alert(this.devices.length);
   }
@@ -30,6 +33,7 @@ export class DevicesPage {
 
   selectRadio(device) {
     this.shareService.setRootDevice(device);
+    this.storage.set('rootDevice', device.id);
     this.navCtrl.pop();
   }
 

src/pages/home/home.html

@@ -11,12 +11,18 @@
 
   <ion-item>
     <ion-label floating>Usuario</ion-label>
-    <ion-input type="text" [(ngModel)]="user" value="baquerojorge@gmail.com"></ion-input>
+    <!--<ion-input type="text" [(ngModel)]="user" value="baquerojorge@gmail.com"></ion-input>-->
+    <ion-input type="text" [(ngModel)]="user"></ion-input>
   </ion-item>
 
   <ion-item>
     <ion-label floating>Contraseña</ion-label>
-    <ion-input type="password" [(ngModel)]="password" value="hiphop2008"></ion-input>
+    <!--<ion-input type="password" [(ngModel)]="password" value="hiphop2008"></ion-input>-->
+    <ion-input type="password" [(ngModel)]="password"></ion-input>
+  </ion-item>
+  <ion-item>
+    <ion-label>Recordarme</ion-label>
+    <ion-checkbox [(ngModel)]="remember"></ion-checkbox>
   </ion-item>
 <div padding>
   <button ion-button full (click)="login()">Ingresar</button>

src/pages/home/home.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { NavController } from 'ionic-angular';
+import { Storage } from '@ionic/storage';
 import { Main } from '../main/main'
 import { AlertController } from 'ionic-angular';
 import { VespotServiceProvider } from '../../providers/vespot-service/vespot-service';
@@ -13,34 +14,52 @@ export class HomePage {
 
   user:any;
   password:any;
+  remember:any;
 
   constructor(public navCtrl: NavController,
 		public alertCtrl: AlertController,
 		public vespotService: VespotServiceProvider,
-    public shareService: ShareService) {
+    public shareService: ShareService,
+    private storage: Storage) {
+      this.storage.get('remember').then((val)=>{
+          if(val) {
+            this.storage.get('authentication').then((valAuth)=>{
+                this.authenticateUser(valAuth);
+            });
+          }
+      });
+  }
+
+  /*ionViewCanEnter() {
+  }*/
 
+  authenticateUser(auth) {
+    this.vespotService.getDevices(auth)
+  	.subscribe(
+        (data) => { // Success
+          this.shareService.setDevices(data);
+          this.shareService.setAuthToken(auth);
+          if(this.remember == true) {
+            this.storage.set('remember', true);
+            this.storage.set('authentication', auth);
+          }
+
+          this.navCtrl.setRoot(Main);
+        },
+        (error) =>{
+          let alert = this.alertCtrl.create({
+        title: 'Advertencia',
+        subTitle: 'Usuario y Contraseña Incorrectos',
+        buttons: ['OK']
+      });
+      alert.present();
+        }
+      );
   }
 
   login() {
-	let auth = this.user + ':' + this.password;
-
-  this.vespotService.getDevices(auth)
-	.subscribe(
-      (data) => { // Success
-        this.shareService.setDevices(data);
-        this.shareService.setAuthToken(auth);
-        this.navCtrl.setRoot(Main);
-      },
-      (error) =>{
-        let alert = this.alertCtrl.create({
-      title: 'Advertencia',
-      subTitle: 'Usuario y Contraseña Incorrectos',
-      buttons: ['OK']
-    });
-    alert.present();
-      }
-    );
-
+    let auth = btoa(this.user + ':' + this.password);
+    this.authenticateUser(auth);
   }
 
 }

src/pages/main/main.ts

@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { NavController } from 'ionic-angular';
 import { AlertController } from 'ionic-angular';
 import { interval } from 'rxjs/observable/interval';
+import { Storage } from '@ionic/storage';
 
 import { HomePage } from '../home/home'
 import { DevicesPage } from '../devices/devices'
@@ -9,17 +10,11 @@ import { ConfigurationPage } from '../configuration/configuration'
 import { ShareService } from '../../services/share/share';
 import { VespotServiceProvider } from '../../providers/vespot-service/vespot-service';
 
-
-
 import {
   GoogleMaps,
   GoogleMap,
   GoogleMapsEvent,
-  GoogleMapOptions,
-  CameraPosition,
-  MarkerOptions,
-  Marker,
-  LatLng
+  GoogleMapOptions
 } from '@ionic-native/google-maps';
 
 @Component({
@@ -43,7 +38,8 @@ export class Main {
   public shareService: ShareService,
   private googleMaps: GoogleMaps,
   private vespotService: VespotServiceProvider,
-  public alertCtrl: AlertController) {
+  public alertCtrl: AlertController,
+  private storage: Storage) {
       this.devicesPage = DevicesPage;
       this.configurationPage = ConfigurationPage;
       this.devices = this.shareService.getDevices();
@@ -54,7 +50,23 @@ export class Main {
 
   ionViewWillEnter() {
     if(typeof this.shareService.getRootDevice() == "undefined") {
-      this.navCtrl.push(DevicesPage);
+      this.storage.get('rootDevice').then((valDevice)=>{
+        if(valDevice == null) {
+          this.navCtrl.push(DevicesPage);
+        } else {
+          let auth = this.shareService.getAuthToken();
+          this.vespotService.getDeviceById(auth, valDevice)
+        	.subscribe(
+              (data) => { // Success
+                this.rootDevice = data[0];
+              },
+              (error) =>{
+      			       console.log('ionViewWillEnter: ' + error);
+              }
+            );
+        }
+      });
+
     } else {
       this.getRootDevicePosition();
     }
@@ -88,10 +100,31 @@ export class Main {
     this.navCtrl.push(DevicesPage);
   }
 
-  openConfigurationPage() {}
+  openConfigurationPage() {
+    this.navCtrl.push(ConfigurationPage);
+  }
 
   closeSession() {
-	   this.navCtrl.setRoot(HomePage);
+    let alert = this.alertCtrl.create({
+      title: 'Confirmación',
+      message: 'Realmente desea cerrar Sesión?',
+      buttons: [{
+        text: 'Si',
+        handler: () => {
+          this.storage.set('authentication', '');
+          this.storage.set('remember', false);
+          this.storage.set('rootDevice', null);
+      	  this.navCtrl.setRoot(HomePage);
+        }
+      },{
+        text: 'No',
+        handler: () => {
+          alert.dismiss();
+          return false;
+        }
+      }]
+    });
+    alert.present();
   }
 
   /**
@@ -147,8 +180,10 @@ export class Main {
       this.vespotService.getPositionByDeviceId(auth, this.shareService.getRootDevice().id)
     	.subscribe(
           (data) => { // Success
-  			       this.rootPosition = data[0];
-               this.getPosition();
+            if(data[0].serverTime != this.rootPosition.serverTime) {
+            this.rootPosition = data[0];
+            this.getPosition();
+            }
           },
           (error) =>{
   			       console.log('updateMarker: ' + error);

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

@@ -18,18 +18,18 @@ export class VespotServiceProvider {
   }
 
   getDevices(auth) {
-    return this.http.get(this.URL + '/devices', {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
+    return this.http.get(this.URL + '/devices', {headers: new HttpHeaders().set('Authorization', 'Basic ' + auth)});
   }
 
   getDeviceById(auth, deviceId) {
-    return this.http.get(this.URL + '/devices?id=' + deviceId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
+    return this.http.get(this.URL + '/devices?id=' + deviceId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + auth)});
   }
 
   getPositionById(auth, positionId) {
-    return this.http.get(this.URL + '/positions?positionId=' + positionId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
+    return this.http.get(this.URL + '/positions?positionId=' + positionId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + auth)});
   }
 
   getPositionByDeviceId(auth, deviceId) {
-    return this.http.get(this.URL + '/positions/lastdeviceposition?deviceId=' + deviceId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + btoa(auth))});
+    return this.http.get(this.URL + '/positions/lastdeviceposition?deviceId=' + deviceId, {headers: new HttpHeaders().set('Authorization', 'Basic ' + auth)});
   }
 }