eliminada carpeta home

yhyenifer · May 7, 2018 · 0dbf67e · 0dbf67e
1 parent 4676658
commit 0dbf67e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 50 deletions.
diff --git a/ATOME/config.xml b/ATOME/config.xml
@@ -76,12 +76,12 @@
         <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
         <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
     </platform>
+    <allow-navigation href="http://192.168.0.6:8100" />
+    <engine name="android" spec="7.0.0" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
-    <plugin name="cordova-plugin-device" spec="^2.0.1" />
+    <plugin name="cordova-plugin-device" spec="^2.0.2" />
     <plugin name="cordova-plugin-splashscreen" spec="^5.0.2" />
-    <plugin name="cordova-plugin-ionic-webview" spec="^1.1.16" />
+    <plugin name="cordova-plugin-ionic-webview" spec="^1.2.0" />
     <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
     <plugin name="cordova-plugin-bluetooth-serial" spec="^0.4.7" />
-    <engine name="android" spec="~7.0.0" />
-    <allow-navigation href="http://192.168.0.6:8100" />
 </widget>
diff --git a/ATOME/package.json b/ATOME/package.json
@@ -30,7 +30,7 @@
     "angularfire2": "^5.0.0-rc.6.0",
     "cordova-android": "7.0.0",
     "cordova-plugin-bluetooth-serial": "^0.4.7",
-    "cordova-plugin-device": "^2.0.1",
+    "cordova-plugin-device": "^2.0.2",
     "cordova-plugin-ionic-keyboard": "^2.0.5",
     "cordova-plugin-ionic-webview": "^1.2.0",
     "cordova-plugin-splashscreen": "^5.0.2",

diff --git a/ATOME/src/pages/crear-bitacora/crear-bitacora.html b/ATOME/src/pages/crear-bitacora/crear-bitacora.html
@@ -41,6 +41,10 @@
         </ion-item>
       </ion-row>
       <ion-row>
+          <ion-item>
+              <ion-label>{{lista}}</ion-label>
+              <ion-input></ion-input>
+            </ion-item>
       <ion-item>
         <ion-label>Altura: {{altura}}</ion-label>
         <ion-input></ion-input>
@@ -55,7 +59,7 @@
   </ion-row>
 
   <ion-fab right bottom>
-      <button ion-fab color="atome" [disabled]="!isenabled" (click)="iniciarPractica()"><ion-icon name="play"></ion-icon></button>
+      <button ion-fab color="atome" [disabled]="!isenabled2" (click)="iniciarPractica()"><ion-icon name="play"></ion-icon></button>
 
     </ion-fab>
 

diff --git a/ATOME/src/pages/crear-bitacora/crear-bitacora.ts b/ATOME/src/pages/crear-bitacora/crear-bitacora.ts
@@ -18,6 +18,7 @@ import { BluetoothArduinoService } from '../../services/bluetoothArduino/bluetoo
   templateUrl: 'crear-bitacora.html',
 })
 export class CrearBitacoraPage {
+  lista: string = "";
   tiempo: any;
   altura: any;
   recibido: string = "";
@@ -26,6 +27,7 @@ export class CrearBitacoraPage {
   items: Observable<any[]>;
   estadoConexion:string;
   isenabled: boolean;
+  isenabled2: boolean;
   public selectedvalue;
   constructor(public navCtrl: NavController, 
     public navParams: NavParams,
@@ -78,6 +80,7 @@ conectar(seleccion){
               handler: () => {
                 this.bluetooth.desconectar();
                 this.bluetooth.conectar(seleccion.id).then(success => {
+
                   this.bluetooth.presentToast(success);
                 }, fail => {
                   this.bluetooth.presentToast(fail);
@@ -106,7 +109,7 @@ conectar(seleccion){
                   this.bluetooth.presentToast(success);
                   this.estadoConexion = "conectada";
                   this.isenabled = true;
-                  this.bluetooth.mensaje = "2";
+                  this.mensaje = "2";
                   this.enviarMensajes();
 
                 }, fail => {
@@ -129,12 +132,17 @@ conectar(seleccion){
         if (entrada != "") {
           this.recibido = entrada;
           if(entrada.substr(0,2)==="a:"){
+            this.isenabled2 = true;
+            this.lista = "PRACTICA LISTA"
             this.altura = entrada.substr(2,entrada.length - 1);
             //this.altura = entrada.length;
           }else if(entrada.substr(0,2)==="t:"){
+            this.isenabled2 = true;
+            this.lista = "PRACTICA LISTA"
             this.tiempo = entrada.substr(2,entrada.length - 1);
           }else if(entrada==="PRACTICA NO LISTA"){
-            //HAZ LO TUYO;
+            this.lista = entrada;
+            this.isenabled2 = false;
           }
 
           console.log(`Entrada: ${entrada}`);
@@ -150,7 +158,7 @@ conectar(seleccion){
 
   desconectar(){
     this.bluetooth.desconectar();
-
+    this.isenabled = false;
   }
 
 iniciarPractica(){

diff --git a/ATOME/src/pages/home/home.html b/ATOME/src/pages/home/home.html
diff --git a/ATOME/src/pages/home/home.scss b/ATOME/src/pages/home/home.scss
diff --git a/ATOME/src/pages/home/home.ts b/ATOME/src/pages/home/home.ts
diff --git a/ATOME/src/pages/login/login.ts b/ATOME/src/pages/login/login.ts
@@ -56,6 +56,8 @@ export class LoginPage {
 
   ionViewDidLoad() {
     console.log('ionViewDidLoad LoginPage');
+    this.user.email = "[email protected]";
+    this.user.password = "123456";
   }
 
 //autenticar