Skip to content

yotta / pictogram

Go to a project
Commit 9a096121 by Arturo Montejo Ráez
Options

Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop

parents 77d4c482 7fd4ccf4
Expand all
Inline Side-by-side
Showing with 84 additions and 50 deletions
android/Pictogram/.gitignore
...@@ -64,3 +64,20 @@ gen/ ...@@ -64,3 +64,20 @@ gen/
/Pictogram.iml /Pictogram.iml
/.gitignore /.gitignore
!/tabletlibrary/tabletlibrary.iml
supervisor_tablet/src/main/res/drawable-xhdpi/
supervisor_tablet/src/main/res/drawable-xxhdpi/
supervisor_tablet/src/main/res/drawable-xxxhdpi/
tabletlibrary/libs/
tabletlibrary/src/main/res/anim/slide_in.xml
tabletlibrary/src/main/res/anim/slide_out.xml
tabletlibrary/src/main/res/drawable-hdpi/descarga.png
tabletlibrary/src/main/res/drawable-hdpi/flash.png
tabletlibrary/src/main/res/drawable-hdpi/session_talk.png
yotta_tablet/src/main/res/drawable-hdpi/
yotta_tablet/src/main/res/drawable-xhdpi/
yotta_tablet/src/main/res/drawable-xxhdpi/
yotta_tablet/src/main/res/drawable-xxxhdpi/
/watch/watch.iml
/commonlibrary/commonlibrary.iml
/tabletlibrary/tabletlibrary.iml
android/Pictogram/commonlibrary/src/main/java/com/yottacode/net/RestapiWrapper.java
...@@ -172,8 +172,7 @@ public class RestapiWrapper { ...@@ -172,8 +172,7 @@ public class RestapiWrapper {
surl=surl.substring(0,surl.length()-1); surl=surl.substring(0,surl.length()-1);
} }
url = new URL(surl); url = new URL(surl);
HttpURLConnection urlConnection = null; HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
urlConnection = (HttpURLConnection) url.openConnection();
urlConnection.setReadTimeout(TIME_OUT); urlConnection.setReadTimeout(TIME_OUT);
urlConnection.setConnectTimeout(TIME_OUT); urlConnection.setConnectTimeout(TIME_OUT);
urlConnection.setRequestMethod("GET"); urlConnection.setRequestMethod("GET");
...@@ -251,7 +250,7 @@ public class RestapiWrapper { ...@@ -251,7 +250,7 @@ public class RestapiWrapper {
protected HttpAsyncTaskParams doInBackground(HttpAsyncTaskParams... params) { protected HttpAsyncTaskParams doInBackground(HttpAsyncTaskParams... params) {
JSONObject jresult=null; JSONObject jresult=null;
try { try {
Log.i(LOG_TAG, " Asking to the server for " + params[0].url+" params:"+params[0].url_params +" JSON?"+params[0].json_params); Log.i(LOG_TAG, " Asking to the server for " + params[0].url+" method:"+params[0].request_method+" params:"+params[0].url_params +" JSON?"+params[0].json_params);
jresult = params[0].request_method.equalsIgnoreCase("GET") jresult = params[0].request_method.equalsIgnoreCase("GET")
? GET(params[0].url, params[0].url_params) ? GET(params[0].url, params[0].url_params)
: POST(params[0].url, params[0].request_method, params[0].url_params, params[0].json_params); : POST(params[0].url, params[0].request_method, params[0].url_params, params[0].json_params);
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/Device.java
...@@ -67,17 +67,18 @@ public class Device extends SQLiteOpenHelper { ...@@ -67,17 +67,18 @@ public class Device extends SQLiteOpenHelper {
/** /**
* Set the value of a param. * Set the value of a param.
* *
* @return serial the official Yotta device ID or null if it is not specified
*/ */
private void setParam(String param, String value) { private void setParam(String param, String value) {
SQLiteDatabase db = this.getWritableDatabase(); SQLiteDatabase db = this.getWritableDatabase();
db.beginTransaction();
ContentValues values=new ContentValues(2); ContentValues values=new ContentValues(2);
values.put("key", param); values.put("key", param);
values.put("value", value); values.put("value", value);
long result=db.replace("params", null, values); long result=db.replace("params", null, values);
if (result==-1) Log.e(this.getClass().getCanonicalName(),"Error when updating param "+param+"="+value); if (result==-1) Log.e(this.getClass().getCanonicalName(),"Error when updating param "+param+"="+value);
db.close(); db.setTransactionSuccessful();
getParamValue(param); db.endTransaction();
//db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
} }
/** /**
...@@ -97,7 +98,7 @@ public class Device extends SQLiteOpenHelper { ...@@ -97,7 +98,7 @@ public class Device extends SQLiteOpenHelper {
cursor.moveToFirst(); cursor.moveToFirst();
value = cursor.getString(0); value = cursor.getString(0);
} }
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return value; return value;
} }
...@@ -173,7 +174,7 @@ public class Device extends SQLiteOpenHelper { ...@@ -173,7 +174,7 @@ public class Device extends SQLiteOpenHelper {
user = new User(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), cursor.getString(5), cursor.getString(6), cursor.getString(7), cursor.getString(8), user = new User(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), cursor.getString(5), cursor.getString(6), cursor.getString(7), cursor.getString(8),
cursor.getInt(9), cursor.getString(10), cursor.getString(11), cursor.getString(12), cursor.getString(13), cursor.getString(14), cursor.getString(15), cursor.getString(16), cursor.getString(17), cursor.getString(18)); cursor.getInt(9), cursor.getString(10), cursor.getString(11), cursor.getString(12), cursor.getString(13), cursor.getString(14), cursor.getString(15), cursor.getString(16), cursor.getString(17), cursor.getString(18));
cursor.close(); cursor.close();
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return user; return user;
} }
...@@ -186,7 +187,7 @@ public class Device extends SQLiteOpenHelper { ...@@ -186,7 +187,7 @@ public class Device extends SQLiteOpenHelper {
users.add(new User(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), cursor.getString(5), cursor.getString(6), cursor.getString(7), cursor.getString(8), users.add(new User(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), cursor.getString(5), cursor.getString(6), cursor.getString(7), cursor.getString(8),
cursor.getInt(9), cursor.getString(10), cursor.getString(11), cursor.getString(12), cursor.getString(13), cursor.getString(14), cursor.getString(15), cursor.getString(16), cursor.getString(17), cursor.getString(18))); cursor.getInt(9), cursor.getString(10), cursor.getString(11), cursor.getString(12), cursor.getString(13), cursor.getString(14), cursor.getString(15), cursor.getString(16), cursor.getString(17), cursor.getString(18)));
cursor.close(); cursor.close();
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return users; return users;
} }
/** /**
...@@ -227,7 +228,7 @@ public class Device extends SQLiteOpenHelper { ...@@ -227,7 +228,7 @@ public class Device extends SQLiteOpenHelper {
if (!user_found) throw new LoginException("User not found", LoginException.BAD_LOGIN); if (!user_found) throw new LoginException("User not found", LoginException.BAD_LOGIN);
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return users; return users;
} }
...@@ -250,12 +251,13 @@ public class Device extends SQLiteOpenHelper { ...@@ -250,12 +251,13 @@ public class Device extends SQLiteOpenHelper {
} }
cursor.close(); cursor.close();
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return users; return users;
} }
public void insertUser(User user) { public void insertUser(User user) {
SQLiteDatabase db = this.getWritableDatabase(); SQLiteDatabase db = this.getWritableDatabase();
db.beginTransaction();
db.execSQL("INSERT INTO users_detail values (" + db.execSQL("INSERT INTO users_detail values (" +
user.get_id_stu() + ", " + user.get_id_stu() + ", " +
"'" + user.get_nickname_stu() + "', " + "'" + user.get_nickname_stu() + "', " +
...@@ -277,7 +279,9 @@ public class Device extends SQLiteOpenHelper { ...@@ -277,7 +279,9 @@ public class Device extends SQLiteOpenHelper {
"'" + user.get_tts_engine_sup() + "'," + "'" + user.get_tts_engine_sup() + "'," +
"'" + user.get_office() + "'" + "'" + user.get_office() + "'" +
")"); ")");
db.close(); db.setTransactionSuccessful();
db.endTransaction();
//db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
} }
...@@ -297,7 +301,7 @@ public class Device extends SQLiteOpenHelper { ...@@ -297,7 +301,7 @@ public class Device extends SQLiteOpenHelper {
} }
cursor.close(); cursor.close();
db.delete("deprecated_images", null, null); db.delete("deprecated_images", null, null);
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
} }
/** /**
...@@ -339,7 +343,7 @@ public class Device extends SQLiteOpenHelper { ...@@ -339,7 +343,7 @@ public class Device extends SQLiteOpenHelper {
Cursor cursor = db.query("picto", new String[]{"path"}, "'url'=?", new String[]{url}, null, null, null, null); Cursor cursor = db.query("picto", new String[]{"path"}, "'url'=?", new String[]{url}, null, null, null, null);
path = cursor.getCount() > 0 ? cursor.getString(0) : null; path = cursor.getCount() > 0 ? cursor.getString(0) : null;
cursor.close(); cursor.close();
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return path; return path;
} }
/** /**
...@@ -355,7 +359,7 @@ public class Device extends SQLiteOpenHelper { ...@@ -355,7 +359,7 @@ public class Device extends SQLiteOpenHelper {
cursor.moveToFirst(); cursor.moveToFirst();
next_key=cursor.getInt(cursor.getColumnIndex("MIN"))-1; next_key=cursor.getInt(cursor.getColumnIndex("MIN"))-1;
cursor.close(); cursor.close();
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return next_key>=0 ? -1 : next_key; return next_key>=0 ? -1 : next_key;
} }
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/DeviceHelper.java
...@@ -24,7 +24,7 @@ public class DeviceHelper { ...@@ -24,7 +24,7 @@ public class DeviceHelper {
return context.getResources().getInteger(R.integer.db_version); return context.getResources().getInteger(R.integer.db_version);
} }
public static float getAppVersion(Context context) { public static float getAppVersion() {
return version; return version;
} }
public static float setAppVersion(float version) { public static float setAppVersion(float version) {
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/PCBDBHelper.java
...@@ -83,7 +83,7 @@ public class PCBDBHelper extends SQLiteOpenHelper { ...@@ -83,7 +83,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
} }
} }
cursor.close(); cursor.close();
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return last_user; return last_user;
} }
...@@ -109,7 +109,7 @@ public class PCBDBHelper extends SQLiteOpenHelper { ...@@ -109,7 +109,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
ContentValues values=new ContentValues(1); ContentValues values=new ContentValues(1);
values.put("json_action", action.getDescription().toString()); values.put("json_action", action.getDescription().toString());
db.insert("action", null, values); db.insert("action", null, values);
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
} }
/** /**
* Load saved actions * Load saved actions
...@@ -130,7 +130,7 @@ public class PCBDBHelper extends SQLiteOpenHelper { ...@@ -130,7 +130,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
Log.e(LOG_TAG, "Recovering batch actions:"+e.getMessage()); Log.e(LOG_TAG, "Recovering batch actions:"+e.getMessage());
} }
cursor.close(); cursor.close();
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return actions; return actions;
} }
...@@ -158,7 +158,7 @@ public class PCBDBHelper extends SQLiteOpenHelper { ...@@ -158,7 +158,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
vocabulary.addPicto(picto); vocabulary.addPicto(picto);
}while (cursor.moveToNext()); }while (cursor.moveToNext());
cursor.close(); cursor.close();
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
return vocabulary; return vocabulary;
} }
...@@ -197,7 +197,7 @@ public class PCBDBHelper extends SQLiteOpenHelper { ...@@ -197,7 +197,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
Log.i(LOG_TAG, " Local student vocabulary updated, id:" + id_stu + ", cats: " + vocabulary.size() + " time:" + (seconds2 - seconds1) + " secs. Size: " + newsize + " read only?" + db.isReadOnly()); Log.i(LOG_TAG, " Local student vocabulary updated, id:" + id_stu + ", cats: " + vocabulary.size() + " time:" + (seconds2 - seconds1) + " secs. Size: " + newsize + " read only?" + db.isReadOnly());
db.setTransactionSuccessful(); db.setTransactionSuccessful();
db.endTransaction(); db.endTransaction();
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
} }
/** /**
...@@ -217,7 +217,7 @@ public class PCBDBHelper extends SQLiteOpenHelper { ...@@ -217,7 +217,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
values.put("attributes",picto.get_json_attrs()); values.put("attributes",picto.get_json_attrs());
db.insert("collection_detail", null, values); db.insert("collection_detail", null, values);
Log.i(LOG_TAG,"Picto added:"+picto.get_translation()); Log.i(LOG_TAG,"Picto added:"+picto.get_translation());
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
} }
/** /**
...@@ -232,7 +232,7 @@ public class PCBDBHelper extends SQLiteOpenHelper { ...@@ -232,7 +232,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
db.delete("collection","id_stu=? AND id_picto=?", db.delete("collection","id_stu=? AND id_picto=?",
new String[]{ Integer.toString(this.currentUser.get_id_stu()), new String[]{ Integer.toString(this.currentUser.get_id_stu()),
Integer.toString(picto_id)}); Integer.toString(picto_id)});
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
} }
/** /**
...@@ -249,7 +249,7 @@ public class PCBDBHelper extends SQLiteOpenHelper { ...@@ -249,7 +249,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
values.put("attributes",attrs); values.put("attributes",attrs);
int updates=db.update("collection",values, "id_stu=? AND id_picto=?", new String[] {Integer.toString(id_stu), Integer.toString(picto_id)}); int updates=db.update("collection",values, "id_stu=? AND id_picto=?", new String[] {Integer.toString(id_stu), Integer.toString(picto_id)});
Log.i(this.getClass().getCanonicalName(),"Modify "+updates+" Picto, id. "+picto_id+" attributes="+attrs);//+ "::"+ Arrays.toString(Thread.currentThread().getStackTrace())); Log.i(this.getClass().getCanonicalName(),"Modify "+updates+" Picto, id. "+picto_id+" attributes="+attrs);//+ "::"+ Arrays.toString(Thread.currentThread().getStackTrace()));
db.close(); //db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
} }
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/NetService.java
...@@ -165,8 +165,8 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin { ...@@ -165,8 +165,8 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
public void result(JSONObject result) { public void result(JSONObject result) {
try { try {
float version = Float.valueOf(result.getString("version")).floatValue(); float version = Float.valueOf(result.getString("version")).floatValue();
if (PCBcontext.getActivityContext() != null && version > DeviceHelper.getAppVersion(PCBcontext.getActivityContext())) { if (PCBcontext.getActivityContext() != null && version > DeviceHelper.getAppVersion()) {
Log.e(LOG_TAG, "New version is required! from v" + DeviceHelper.getAppVersion(PCBcontext.getContext()) + " to v" + version); Log.e(LOG_TAG, "New version is required! from v" + DeviceHelper.getAppVersion() + " to v" + version);
newVersionAlert(PCBcontext.getActivityContext(), version); newVersionAlert(PCBcontext.getActivityContext(), version);
} }
} catch (Exception e) { } catch (Exception e) {
...@@ -191,9 +191,9 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin { ...@@ -191,9 +191,9 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
//cada restfullSynchroTimming aprox. se fuerza sincronización de vocabulario y configuración de usuario //cada restfullSynchroTimming aprox. se fuerza sincronización de vocabulario y configuración de usuario
long now = new Date().getTime(); long now = new Date().getTime();
Log.i(LOG_TAG, "Vocabulary request?"+PCBcontext.is_user_logged()+" ("+restfullSynchroTimming+" milisecs)");
if (PCBcontext.is_user_logged()) { if (PCBcontext.is_user_logged()) {
if (restfullSynchroTimming > 0 && (now - lastRestfullSynchro > restfullSynchroTimming)) { if (restfullSynchroTimming > 0 && (now - lastRestfullSynchro > restfullSynchroTimming)) {
Log.i(LOG_TAG, "Vocabulary request.");
PCBcontext.getVocabulary().synchronize(); PCBcontext.getVocabulary().synchronize();
synchronizeStudentAttributes(); synchronizeStudentAttributes();
lastRestfullSynchro = now; lastRestfullSynchro = now;
...@@ -217,7 +217,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin { ...@@ -217,7 +217,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
private void synchronizeStudentAttributes() { private void synchronizeStudentAttributes() {
int id=PCBcontext.getPcbdb().getCurrentUser().get_id_stu(); int id=PCBcontext.getPcbdb().getCurrentUser().get_id_stu();
PCBcontext.getRestapiWrapper().ask("stu/" + id, null, "get", new RestapiWrapper.iRestapiListener() { PCBcontext.getRestapiWrapper().ask("stu/" + id, new RestapiWrapper.iRestapiListener() {
@Override @Override
public void preExecute() { public void preExecute() {
...@@ -230,10 +230,11 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin { ...@@ -230,10 +230,11 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
@Override @Override
public void result(JSONObject result) { public void result(JSONObject result) {
Object objects[] = new Object[0]; Object objects[];
try { try {
objects = new Object[]{new JSONObject().put("student",result)}; objects = new Object[]{new JSONObject().put("student",result)};
PCBcontext.getStudentTalk().call(objects); PCBcontext.getStudentTalk().call(objects);
Log.i(LOG_TAG,"Student attributes synchronized");
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
Log.e(LOG_TAG, e.getMessage() ); Log.e(LOG_TAG, e.getMessage() );
......
android/Pictogram/supervisor_tablet/supervisor_tablet.iml
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/CIFlavorDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/CIFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/CIFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/assets" type="java-test-resource" />
...@@ -50,13 +57,6 @@ ...@@ -50,13 +57,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testCIFlavorDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/CIFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/CIFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/CIFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/assets" type="java-resource" />
...@@ -65,14 +65,6 @@ ...@@ -65,14 +65,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/CIFlavor/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/assets" type="java-test-resource" />
...@@ -81,6 +73,14 @@ ...@@ -81,6 +73,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTestCIFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testCIFlavor/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
...@@ -122,6 +122,8 @@ ...@@ -122,6 +122,8 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
...@@ -132,11 +134,13 @@ ...@@ -132,11 +134,13 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content> </content>
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
...@@ -786,7 +786,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab ...@@ -786,7 +786,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
PCBcontext.getActionLog().log(new TalkAction(TalkAction.SELECT, p)); PCBcontext.getActionLog().log(new TalkAction(TalkAction.SELECT, p));
hidePictoMainGridView(); hidePictoMainGridView();
} else if (tapeAdapter.getCount() < PictogramActivity.this.maxInTape) { } else if (tapeAdapter.getCount() < PictogramActivity.this.maxInTape && !PictogramActivity.this.tapeAdapter.play()) {
addPictoWord(p); addPictoWord(p);
} }
} }
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/net/NetServiceTablet.java
...@@ -2,9 +2,11 @@ package com.yottacode.pictogram.tabletlibrary.net; ...@@ -2,9 +2,11 @@ package com.yottacode.pictogram.tabletlibrary.net;
import android.app.Activity; import android.app.Activity;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.support.v4.app.TaskStackBuilder;
import android.util.Log; import android.util.Log;
import com.yottacode.pictogram.dao.User; import com.yottacode.pictogram.dao.User;
...@@ -29,14 +31,14 @@ public class NetServiceTablet implements NetService.iNetServiceDevice { ...@@ -29,14 +31,14 @@ public class NetServiceTablet implements NetService.iNetServiceDevice {
public void build() { public void build() {
this.builder = new NotificationCompat.Builder(PCBcontext.getContext()).setAutoCancel(true); this.builder = new NotificationCompat.Builder(PCBcontext.getContext()).setAutoCancel(true).setOngoing(true);
/*Intent resultIntent = new Intent(PCBcontext.getContext(), PictogramActivity.class); Intent resultIntent = new Intent(PCBcontext.getContext(), PictogramActivity.class);
TaskStackBuilder stackBuilder = TaskStackBuilder.create(PCBcontext.getContext()); TaskStackBuilder stackBuilder = TaskStackBuilder.create(PCBcontext.getContext());
stackBuilder.addParentStack(PictogramActivity.class); stackBuilder.addParentStack(PictogramActivity.class);
stackBuilder.addNextIntent(resultIntent); stackBuilder.addNextIntent(resultIntent);
PendingIntent resultPendingIntent = PendingIntent resultPendingIntent =
stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT); stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
builder.setContentIntent(resultPendingIntent);*/ builder.setContentIntent(resultPendingIntent);
} }
public void notifyStatus(boolean updated) { public void notifyStatus(boolean updated) {
...@@ -71,8 +73,15 @@ public class NetServiceTablet implements NetService.iNetServiceDevice { ...@@ -71,8 +73,15 @@ public class NetServiceTablet implements NetService.iNetServiceDevice {
public static void restart_PictogramTablet(Activity activity) { public static void restart_PictogramTablet(Activity activity) {
Log.i(LOG_TAG,"App restarting"); Log.i(LOG_TAG,"App restarting");
Intent serialActivity=activity.getIntent();
Context context=activity.getBaseContext(); Context context=activity.getBaseContext();
Class serialClass;
try {
serialClass=Class.forName(PCBcontext.getContext().getString(R.string.SerialClass));
} catch (ClassNotFoundException e) {
Log.e(LOG_TAG,"S:"+PCBcontext.getContext().getString(R.string.SerialClass));
serialClass=SerialActivity.class;
}
Intent serialActivity = new Intent(context, serialClass);
serialActivity.putExtra("resetPrevUser", false); serialActivity.putExtra("resetPrevUser", false);
serialActivity.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); serialActivity.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(serialActivity); context.startActivity(serialActivity);
......
android/Pictogram/watch/src/main/java/com/yottacode/pictogram/watch/net/NetServiceWatch.java
...@@ -46,7 +46,7 @@ public class NetServiceWatch implements NetService.iNetServiceDevice { ...@@ -46,7 +46,7 @@ public class NetServiceWatch implements NetService.iNetServiceDevice {
restart_app(new Intent(PCBcontext.getContext(), Activity), direct_login); restart_app(new Intent(PCBcontext.getContext(), Activity), direct_login);
} }
@Override
public void restart_app(Intent intent, boolean direct_login) { public void restart_app(Intent intent, boolean direct_login) {
intent.putExtra("resetPrevUser", !direct_login); intent.putExtra("resetPrevUser", !direct_login);
PCBcontext.getContext().startActivity(intent); PCBcontext.getContext().startActivity(intent);
......
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