Skip to content

yotta / pictogram

Go to a project
Commit 3cc032d3 by Miguel Ángel García Cumbreras
Options

Pequeños errores corregidos

parent 380c8c61
Inline Side-by-side
Showing with 53 additions and 9 deletions
android/Pictogram/app/src/main/java/com/yottacode/pictogram/gui/SerialActivity.java
...@@ -183,8 +183,8 @@ public class SerialActivity extends Activity implements iRestapiListener, iImgDo ...@@ -183,8 +183,8 @@ public class SerialActivity extends Activity implements iRestapiListener, iImgDo
String password = mSerialViewPass.getText().toString(); String password = mSerialViewPass.getText().toString();
// DE PRUEBA // DE PRUEBA
// Alumno // Alumno
username = "faf0001"; //username = "faf0001";
password = "faf0001"; //password = "faf0001";
// Supervisor // Supervisor
//username = "dofer@ujaen.es"; //username = "dofer@ujaen.es";
//password = "dofer"; //password = "dofer";
......
android/Pictogram/app/src/main/java/com/yottacode/pictogram/net/NetService.java
...@@ -40,6 +40,10 @@ public class NetService implements Runnable, iRestapiListener { ...@@ -40,6 +40,10 @@ public class NetService implements Runnable, iRestapiListener {
exec.scheduleWithFixedDelay(this, 0, delay, TimeUnit.SECONDS); exec.scheduleWithFixedDelay(this, 0, delay, TimeUnit.SECONDS);
} }
public NetService(){
}
public boolean online() {return updated;} public boolean online() {return updated;}
/** /**
......
android/Pictogram/app/src/main/res/values-en/strings.xml
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<string name="prompt_serial_pass">Password</string> <string name="prompt_serial_pass">Password</string>
<string name="title_activity_login">Login</string> <string name="title_activity_login">Login</string>
<string name="title_activity_login_activity_fragment">Users login</string> <string name="title_activity_login_activity_fragment">Users login</string>
<string name="title_activity_login_activity_fragments">Users login</string>
<string name="title_activity_pictogram">PictogramActivity</string> <string name="title_activity_pictogram">PictogramActivity</string>
<string name="title_activity_serial">Write the access data</string> <string name="title_activity_serial">Write the access data</string>
<string name="title_activity_splash_screen">SplashScreenActivity</string> <string name="title_activity_splash_screen">SplashScreenActivity</string>
...@@ -32,6 +33,7 @@ ...@@ -32,6 +33,7 @@
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="tabletNoYotta">Important: writes this ID number for your cabinet</string> <string name="tabletNoYotta">Important: writes this ID number for your cabinet</string>
<string name="loginNoUsers">There are no students assigned with your tablet. Please, ask your cabinet</string> <string name="loginNoUsers">There are no students assigned with your tablet. Please, ask your cabinet</string>
<string name="serialRepeated"></string>
<!-- Login --> <!-- Login -->
<string name="systemMessage">System message</string> <string name="systemMessage">System message</string>
......
android/Pictogram/app/src/main/res/values-es/strings.xml
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<string name="loginTitle">¿Quién eres?</string> <string name="loginTitle">¿Quién eres?</string>
<string name="toggle_turn_on">Desactivar modo supervisor</string> <string name="toggle_turn_on">Desactivar modo supervisor</string>
<string name="toggle_turn_off">Activar modo supervisor</string> <string name="toggle_turn_off">Activar modo supervisor</string>
<string name="db_script_error">Error al actualizar la base de datos</string>
<!-- Alert dialogs --> <!-- Alert dialogs -->
<string name="exitPictogram">Salir de Pictogram</string> <string name="exitPictogram">Salir de Pictogram</string>
......
android/Pictogram/app/src/main/res/values/strings.xml
<?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="title_activity_translate2">Translate2</string>
<string name="hello_world">Hello world!</string> <string name="app_name">Pictogram</string>
<string name="action_settings">Settings</string> <string name="action_settings">Parámetros</string>
<string name="title_activity_picto_board">PictoBoard</string> <string name="title_activity_login">Entrada de usuarios</string>
<string name="title_activity_login_activity_fragments">Entrada de usuarios</string>
<string name="title_activity_login_activity_fragment">Entrada de usuarios</string>
<string name="title_activity_pictogram">PictogramActivity</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="title_activity_splash_screen">SplashScreenActivity</string>
<!-- Strings de serial -->
<string name="title_activity_serial">Indique los datos de acceso</string>
<string name="prompt_serial_mail">Usuario</string>
<string name="prompt_serial_pass">Contraseña</string>
<string name="action_entrar">Entrar</string>
<string name="error_invalid_serial">Este nº de serie no es correcto</string>
<string name="loginTitle">¿Quién eres?</string>
<string name="toggle_turn_on">Desactivar modo supervisor</string> <string name="toggle_turn_on">Desactivar modo supervisor</string>
<string name="toggle_turn_off">Activar modo supervisor</string> <string name="toggle_turn_off">Activar modo supervisor</string>
<string name="db_script_error">Error al actualizar la base de datos</string>
<!-- Alert dialogs -->
<string name="exitPictogram">Salir de Pictogram</string>
<string name="enterEscapeCode">Introduce código de escape</string>
<string name="editEscapeCode">Cambiar el código de escape</string>
<string name="newEscapeCode">Nuevo código de escape</string>
<string name="enterNewEscapeCode">Escribe el nuevo código de escape</string>
<string name="reEnterNewEscapeCode">Vuelve a escribirlo</string>
<string name="codeModified">El código de desbloqueo ha sido modificado correctamente</string>
<string name="wrongCode">El código introducido no es correcto</string>
<string name="codesNotEqual">Los codigos introducidos no coinciden</string>
<string name="ok">Aceptar</string>
<string name="cancel">Cancelar</string>
<string name="tabletNoYotta">Importante: anote este nº de dispositivo para indicárselo al responsable de su asociación o gabinete</string>
<string name="loginNoUsers">No está asignado ningún alumno con tu tablet. Consulte con el responsable de su asociación o gabinete</string>
<string name="serialRepeated">Este tablet ya ha sido registrado previamente o el nº de serie no es correcto. Inténtelo de nuevo o consulte con nuestro servicio técnico</string>
<!-- Login -->
<string name="systemMessage">Mensaje del sistema</string>
<string name="noInternetConnection">No hay conexión a internet. Inténtelo más tarde</string>
<string name="exitingApp">Saliendo de la aplicación</string>
<string name="serverError">Error en el servidor de datos. Inténtelo más tarde</string>
<item type="integer" name="maxInTape">8</item>
</resources> </resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment