Skip to content

yotta / pictogram

Go to a project
Commit b9631968 by Fernando Martínez Santiago
Options

Pictogram 1.5 beta 2

parent 96674283
Inline Side-by-side
Showing with 41 additions and 29 deletions
android/Pictogram/commonlibrary/build.gradle
...@@ -16,6 +16,8 @@ android { ...@@ -16,6 +16,8 @@ android {
resValue "string", "apk", "to_be_set_in_subproject" resValue "string", "apk", "to_be_set_in_subproject"
resValue "string", "VersionManagerClass", "to_be_set_in_subproject" resValue "string", "VersionManagerClass", "to_be_set_in_subproject"
resValue "string", "login_web", "https://login.pictogramweb.com" resValue "string", "login_web", "https://login.pictogramweb.com"
resValue "string", "supervisorapp_name", "Pictogram Supervisor"
resValue "string", "communicatorapp_name", "Pictogram Communicator"
} }
buildTypes { buildTypes {
release { release {
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/Device.java
...@@ -292,12 +292,17 @@ public class Device extends SQLiteOpenHelper { ...@@ -292,12 +292,17 @@ public class Device extends SQLiteOpenHelper {
User user; User user;
Cursor cursor = db.query("users_detail", null, null, null, null, null, null, null); Cursor cursor = db.query("users_detail", null, null, null, null, null, null, null);
Vector<User> users = new Vector<User>(cursor.getCount()); Vector<User> users = new Vector<User>(cursor.getCount());
Vector<Integer> supervisors=new Vector<>();
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
user = new User(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), cursor.getInt(5), user = new User(cursor.getInt(0), cursor.getString(1), cursor.getString(2), cursor.getString(3), cursor.getString(4), cursor.getInt(5),
cursor.getString(6), cursor.getString(7), cursor.getString(8),cursor.getString(9),cursor.getInt(10), cursor.getString(11), cursor.getString(6), cursor.getString(7), cursor.getString(8),cursor.getString(9),cursor.getInt(10), cursor.getString(11),
cursor.getString(12), cursor.getString(13),cursor.getString(14), cursor.getString(15), cursor.getString(16), cursor.getString(17), cursor.getString(12), cursor.getString(13),cursor.getString(14), cursor.getString(15), cursor.getString(16), cursor.getString(17),
cursor.getString(18),cursor.getString(19)); cursor.getString(18),cursor.getString(19));
users.add(user);
if (!context.getString(R.string.app_name).equals(context.getString(R.string.supervisorapp_name)) || !supervisors.contains(cursor.getInt(9)))
users.add(user);
supervisors.add(cursor.getInt(9));
} }
cursor.close(); cursor.close();
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/UserLogin.java
...@@ -267,11 +267,11 @@ public class UserLogin { ...@@ -267,11 +267,11 @@ public class UserLogin {
if (PCBcontext.is_user_logged()) PCBcontext.unset_user(); if (PCBcontext.is_user_logged()) PCBcontext.unset_user();
boolean online = RestapiWrapper.ping(activity.getResources().getString(R.string.server), "server/ping"); boolean online = RestapiWrapper.ping(activity.getResources().getString(R.string.server), "server/ping");
if (isSupervisorLoginPattern(username)) if (isSupervisorLoginPattern(username))
if (PCBcontext.getActivityContext().getPackageName().equals("com.yottacode.pictogram.communicator")) if (!PCBcontext.getContext().getString(R.string.app_name).equals(PCBcontext.getContext().getString(R.string.supervisorapp_name)))
GUITools.show_alert(PCBcontext.getActivityContext(), R.string.login_ilegaluser); GUITools.show_alert(PCBcontext.getActivityContext(), R.string.login_ilegaluser);
else else
manageSupervisorLogin(username, password, online, activity, activityAfterLogin); manageSupervisorLogin(username, password, online, activity, activityAfterLogin);
else if (!PCBcontext.getActivityContext().getPackageName().equals("com.yottacode.pictogram.communicator")) else if (!PCBcontext.getContext().getString(R.string.app_name).equals(PCBcontext.getContext().getString(R.string.communicatorapp_name)))
GUITools.show_alert(PCBcontext.getActivityContext(),R.string.login_ilegaluser); GUITools.show_alert(PCBcontext.getActivityContext(),R.string.login_ilegaluser);
else else
manageStudentLogin(username,password,online, activity, activityAfterLogin); manageStudentLogin(username,password,online, activity, activityAfterLogin);
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java
...@@ -456,9 +456,9 @@ public class Vocabulary implements Iterable<Picto> { ...@@ -456,9 +456,9 @@ public class Vocabulary implements Iterable<Picto> {
if (prev_picto!=null) { //El picto ya existe if (prev_picto!=null) { //El picto ya existe
removePicto(prev_picto.get_category(),prev_picto.get_id()); //borramos el picto local actual removePicto(prev_picto.get_category(),prev_picto.get_id()); //borramos el picto local actual
Log.i(LOG_TAG,"Picto "+exp+" position is filled with "+prev_picto.get_translation()+"(id "+prev_picto.get_id()+"). Previous local picto "+prev_picto.get_id()+" is deleted.");
} }
int id=PCBcontext.getDevice().getNextLocalPictoID(); int id=PCBcontext.getDevice().getNextLocalPictoID();
Log.i(LOG_TAG,"Picto "+prev_picto.get_translation()+" position is filled with "+exp+"("+id+")"+" Previous Stupictoid: "+prev_picto.get_stupicto_id()+". Previous picto id"+prev_picto.get_id()+" is deleted.");
try { try {
final Picto picto = new Picto(id, url, exp, cat, coord_x, coord_y, free_category_coord_x, free_category_coord_y,prev_picto!=null ? prev_picto.get_stupicto_id() : Picto.STUPICTO_NULL,user_avatar); final Picto picto = new Picto(id, url, exp, cat, coord_x, coord_y, free_category_coord_x, free_category_coord_y,prev_picto!=null ? prev_picto.get_stupicto_id() : Picto.STUPICTO_NULL,user_avatar);
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/PictoUploader.java
...@@ -34,7 +34,7 @@ public class PictoUploader { ...@@ -34,7 +34,7 @@ public class PictoUploader {
public PictoUploader(Picto picto) { public PictoUploader(Picto picto) {
this.picto=picto; this.picto=picto;
this.local_picto_id=local_picto_id;
} }
private boolean uploadImg( Img img) throws UnsupportedEncodingException { private boolean uploadImg( Img img) throws UnsupportedEncodingException {
...@@ -245,7 +245,7 @@ public class PictoUploader { ...@@ -245,7 +245,7 @@ public class PictoUploader {
/** /**
* if the a picto was modified from the PCB, the original one is modified and a new one is included * if the a picto was modified from the PCB, the original one is modified and a new one is included
*/ */
private void deleteRemotePicto(final int id_stupicto) { private void deleteRemotePictoAndUpload(final int id_stupicto) {
final String picto_str="/picto"; final String picto_str="/picto";
String operation=PCBcontext.getPcbdb().getCurrentUser().get_restapi_operation_stu()+picto_str+"/"+id_stupicto; String operation=PCBcontext.getPcbdb().getCurrentUser().get_restapi_operation_stu()+picto_str+"/"+id_stupicto;
...@@ -294,7 +294,7 @@ public class PictoUploader { ...@@ -294,7 +294,7 @@ public class PictoUploader {
public void upload() throws IOException { public void upload() throws IOException {
final int stupicto_id=this.picto.get_stupicto_id(); final int stupicto_id=this.picto.get_stupicto_id();
if (this.picto.get_stupicto_id()!= Picto.STUPICTO_NULL) if (this.picto.get_stupicto_id()!= Picto.STUPICTO_NULL)
deleteRemotePicto(stupicto_id); deleteRemotePictoAndUpload(stupicto_id);
else else
uploadLocalPicto(); uploadLocalPicto();
} }
...@@ -349,7 +349,7 @@ public class PictoUploader { ...@@ -349,7 +349,7 @@ public class PictoUploader {
} }
private void fail(String msg) { private void fail(String msg) {
int errmsg = int errmsg =
msg.contains("Error: Picto already in student's vocabulary") msg.contains("Error: Picto already in student's vocabulary")
? R.string.upload_duplicated ? R.string.upload_duplicated
...@@ -358,15 +358,19 @@ public class PictoUploader { ...@@ -358,15 +358,19 @@ public class PictoUploader {
PCBcontext.getActivityContext(), PCBcontext.getActivityContext(),
(PCBcontext.getActivityContext().getResources().getString(errmsg) (PCBcontext.getActivityContext().getResources().getString(errmsg)
+":"+PictoUploader.this.picto.get_translation()), Toast.LENGTH_LONG).show(); +":"+PictoUploader.this.picto.get_translation()), Toast.LENGTH_LONG).show();
} }
private void success(JSONObject server_response) { private void success(JSONObject server_response) {
Log.i(LOG_TAG,"Deleting local picto?????????????????????????????????? "+picto.get_id()+" ");
if (picto.is_local()) {
Log.i(LOG_TAG,"Deleting local picto "+picto.get_id()+" ");
PCBcontext.getPcbdb().deletePicto(picto.get_id());
}
int stupicto_id= 0; int stupicto_id= 0;
try { try {
stupicto_id = server_response.getInt("id"); stupicto_id = server_response.getInt("id");
picto.set_stupicto_id(stupicto_id); picto.set_stupicto_id(stupicto_id);
PCBcontext.getVocabulary().addPicto(picto); PCBcontext.getVocabulary().addPicto(picto);
PCBcontext.getPcbdb().deletePicto(this.local_picto_id);
PCBcontext.getPcbdb().savePicto(PictoUploader.this.picto); PCBcontext.getPcbdb().savePicto(PictoUploader.this.picto);
PCBcontext.getRoom().emit(new VocabularyAction(VocabularyAction.ADD, this.picto)); PCBcontext.getRoom().emit(new VocabularyAction(VocabularyAction.ADD, this.picto));
Toast.makeText( Toast.makeText(
...@@ -377,6 +381,6 @@ public class PictoUploader { ...@@ -377,6 +381,6 @@ public class PictoUploader {
fail(e.getMessage()); fail(e.getMessage());
Log.e(LOG_TAG,"Error uploading picto when getting json from server:"+e.getMessage()+":"+server_response.toString()); Log.e(LOG_TAG,"Error uploading picto when getting json from server:"+e.getMessage()+":"+server_response.toString());
} }
} }
} }
android/Pictogram/supervisor/src/main/java/com/yottacode/pictogram/supervisor/gui/VocabularyManager.java
...@@ -342,7 +342,6 @@ public class VocabularyManager extends Activity implements VocabularyTalk.iVocab ...@@ -342,7 +342,6 @@ public class VocabularyManager extends Activity implements VocabularyTalk.iVocab
@Override @Override
protected void onStop() { protected void onStop() {
super.onStop(); super.onStop();
Log.e(LOG_TAG, "Closing Pictogram Activity");
PCBcontext.getNetService().closeNotifyStatus(); PCBcontext.getNetService().closeNotifyStatus();
} }
......
android/Pictogram/supervisor/src/main/java/com/yottacode/pictogram/supervisor/gui/session/PictoAdapter.java
...@@ -7,7 +7,6 @@ import android.graphics.Canvas; ...@@ -7,7 +7,6 @@ import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.util.Log;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
...@@ -18,7 +17,7 @@ import android.widget.ImageView; ...@@ -18,7 +17,7 @@ import android.widget.ImageView;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.yottacode.pictogram.tabletlibrary.R; import com.yottacode.pictogram.supervisor.R;
import com.yottacode.tools.BitmapTools; import com.yottacode.tools.BitmapTools;
import java.util.Calendar; import java.util.Calendar;
......
android/Pictogram/supervisor/src/main/java/com/yottacode/pictogram/supervisor/gui/session/SessionFragment.java
...@@ -6,7 +6,6 @@ import android.graphics.Bitmap; ...@@ -6,7 +6,6 @@ import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -15,7 +14,7 @@ import android.widget.ListView; ...@@ -15,7 +14,7 @@ import android.widget.ListView;
import com.yottacode.pictogram.dao.Picto; import com.yottacode.pictogram.dao.Picto;
import com.yottacode.pictogram.net.websockets.ActionTalk; import com.yottacode.pictogram.net.websockets.ActionTalk;
import com.yottacode.pictogram.tabletlibrary.R; import com.yottacode.pictogram.supervisor.R;
import com.yottacode.pictogram.tools.PCBcontext; import com.yottacode.pictogram.tools.PCBcontext;
import com.yottacode.tools.BitmapTools; import com.yottacode.tools.BitmapTools;
......
android/Pictogram/supervisor/supervisor.iml
...@@ -40,13 +40,6 @@ ...@@ -40,13 +40,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/PreFlavor/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/PreFlavor/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/PreFlavor/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
...@@ -54,6 +47,13 @@ ...@@ -54,6 +47,13 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/PreFlavor/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/PreFlavor/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/PreFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/PreFlavor/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/PreFlavor/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/assets" type="java-resource" />
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/SerialActivity.java
...@@ -68,7 +68,7 @@ public class SerialActivity extends Activity { ...@@ -68,7 +68,7 @@ public class SerialActivity extends Activity {
final Vector<User> users = new Vector<>(); final Vector<User> users = new Vector<>();
Vector<Integer> idUsers=new Vector<>(); Vector<Integer> idUsers=new Vector<>();
//Rellenar la lista con solo usuarios supervisor //Rellenar la lista con solo usuarios del tipo adecuado
if(!vusers.isEmpty()) if(!vusers.isEmpty())
for(User user: vusers){ for(User user: vusers){
users.add(user); users.add(user);
...@@ -91,8 +91,12 @@ public class SerialActivity extends Activity { ...@@ -91,8 +91,12 @@ public class SerialActivity extends Activity {
Class activityAfterLogin = null; Class activityAfterLogin = null;
try { try {
activityAfterLogin = Class.forName(getString(R.string.activityAfterLogin)); activityAfterLogin = Class.forName(getString(R.string.activityAfterLogin));
new UserLogin().login(users.elementAt(position).get_nickname_stu(), if (PCBcontext.getContext().getString(R.string.app_name).equals(PCBcontext.getContext().getString(R.string.supervisorapp_name)))
users.elementAt(position).get_pwd_stu(),SerialActivity.this, activityAfterLogin); new UserLogin().login(users.elementAt(position).get_email_sup(),
users.elementAt(position).get_pwd_sup(),SerialActivity.this, activityAfterLogin);
else
new UserLogin().login(users.elementAt(position).get_nickname_stu(),
users.elementAt(position).get_pwd_stu(),SerialActivity.this, activityAfterLogin);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
Log.e(LOG_TAG,e.toString()); Log.e(LOG_TAG,e.toString());
} }
......
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