Skip to content

yotta / pictogram

Go to a project
Commit bbe38841 by Germán Callejas Alcántara
Options

Eliminación de varios logs en el código para comprobaciones propias

parent 5d7657e3
Inline Side-by-side
Showing with 0 additions and 22 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/cropper/EditPictoActivity.java
...@@ -343,7 +343,6 @@ public class EditPictoActivity extends Activity { ...@@ -343,7 +343,6 @@ public class EditPictoActivity extends Activity {
//Obtener el picto a editar //Obtener el picto a editar
if(editar){ if(editar){
Log.i(DEBUG_MESSAGE,"EDITAR");
p = PCBcontext.getVocabulary().get_picto(getIntent().getExtras().getInt(Picto.JSON_ATTTRS.CATEGORY),getIntent().getExtras().getInt(PictoMenu.ID_PICTO_IMAGE)); p = PCBcontext.getVocabulary().get_picto(getIntent().getExtras().getInt(Picto.JSON_ATTTRS.CATEGORY),getIntent().getExtras().getInt(PictoMenu.ID_PICTO_IMAGE));
legend.setText(p.get_translation()); legend.setText(p.get_translation());
supAsociado.setText(p.get_user_avatar()==null ? NO_SUP_TEXT : p.get_user_avatar()); supAsociado.setText(p.get_user_avatar()==null ? NO_SUP_TEXT : p.get_user_avatar());
...@@ -352,13 +351,11 @@ public class EditPictoActivity extends Activity { ...@@ -352,13 +351,11 @@ public class EditPictoActivity extends Activity {
if(p.get_audioFile() != null){ if(p.get_audioFile() != null){
borrado = false; borrado = false;
hayGrabacion = true; hayGrabacion = true;
Log.i(DEBUG_MESSAGE,"Picto CON sonido asociado");
layoutGrabacion.setVisibility(View.GONE); layoutGrabacion.setVisibility(View.GONE);
layoutPreview.setVisibility(View.VISIBLE); layoutPreview.setVisibility(View.VISIBLE);
botonReproducir.setEnabled(true); botonReproducir.setEnabled(true);
assignFileToPlayer(p.get_audioFile()); assignFileToPlayer(p.get_audioFile());
}else{ }else{
Log.i(DEBUG_MESSAGE,"Picto SIN sonido asociado");
layoutPreview.setVisibility(View.INVISIBLE); layoutPreview.setVisibility(View.INVISIBLE);
layoutGrabacion.setVisibility(View.VISIBLE); layoutGrabacion.setVisibility(View.VISIBLE);
hayGrabacion = false; hayGrabacion = false;
...@@ -399,7 +396,6 @@ public class EditPictoActivity extends Activity { ...@@ -399,7 +396,6 @@ public class EditPictoActivity extends Activity {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
String[] assocciated_person = mDrawerList.getAdapter().getItem(position).toString().split("\n"); String[] assocciated_person = mDrawerList.getAdapter().getItem(position).toString().split("\n");
supAsociado.setText(assocciated_person[1]); supAsociado.setText(assocciated_person[1]);
Log.i("TAG_PRUEBS","Sup elegido: "+supAsociado.getText());
mDrawerLayout.closeDrawer(Gravity.RIGHT); mDrawerLayout.closeDrawer(Gravity.RIGHT);
} }
}); });
...@@ -443,29 +439,23 @@ public class EditPictoActivity extends Activity { ...@@ -443,29 +439,23 @@ public class EditPictoActivity extends Activity {
} }
if(hayGrabacion) { //Si ha grabado algo -> Ir a renombrarlo if(hayGrabacion) { //Si ha grabado algo -> Ir a renombrarlo
Log.i(DEBUG_MESSAGE,"Ha grabado pasa a comprobar");
File file = new File(previewAudioPath); File file = new File(previewAudioPath);
if (file.exists()) { if (file.exists()) {
Log.i(DEBUG_MESSAGE,"fichero test.mp3 y existia");
File from = new File(previewAudioPath); File from = new File(previewAudioPath);
File to = new File(editar ? dirAudioPath + File.separator + legend.getText().toString() + "_" + id_pic + "_audio.mp3" : File to = new File(editar ? dirAudioPath + File.separator + legend.getText().toString() + "_" + id_pic + "_audio.mp3" :
dirAudioPath + File.separator + legend.getText().toString() + "_new_" + pathNumber + "_audio.mp3"); dirAudioPath + File.separator + legend.getText().toString() + "_new_" + pathNumber + "_audio.mp3");
if (from.exists()){ if (from.exists()){
from.renameTo(to); from.renameTo(to);
audioPath = to.getPath().toString(); audioPath = to.getPath().toString();
Log.i(DEBUG_MESSAGE,"Path renombrado "+audioPath);
} }
} }
} }
Log.i(DEBUG_MESSAGE,"Picto: "+p.get_translation()+"--sonido: "+p.get_audioPath()+"-->"+p.getUriSound());
Intent intent = getIntent(); //Mandar a pictogram activity el path y el texto de la imagen Intent intent = getIntent(); //Mandar a pictogram activity el path y el texto de la imagen
intent.putExtra(PictoMenu.IS_EDIT, editar); //Para saber despues si estas editando o añadiendo nuevo y coger los datos de intent o de data en OnActivityResult intent.putExtra(PictoMenu.IS_EDIT, editar); //Para saber despues si estas editando o añadiendo nuevo y coger los datos de intent o de data en OnActivityResult
intent.putExtra(PictoMenu.PATH, filepath); //Mandar Path imagen intent.putExtra(PictoMenu.PATH, filepath); //Mandar Path imagen
intent.putExtra(PictoMenu.PATH_SOUND,editar ? ((!borrado && p.getUriSound()!= null) ? p.get_audioPath() : audioPath) : audioPath); //Mandar el path del audio intent.putExtra(PictoMenu.PATH_SOUND,editar ? ((!borrado && p.getUriSound()!= null) ? p.get_audioPath() : audioPath) : audioPath); //Mandar el path del audio
Log.i(DEBUG_MESSAGE,"Manda esto: "+ (editar ? ((!borrado && p.getUriSound()!= null) ? "p.get_audioPath()" : "borrado+audioPath" ) : "audioPath"));
Log.e(LOG_TAG, "PATH SOUND:"+audioPath);
intent.putExtra(Picto.JSON_ATTTRS.EXPRESSION, legend.getText().toString()); //Mandar expresion nueva intent.putExtra(Picto.JSON_ATTTRS.EXPRESSION, legend.getText().toString()); //Mandar expresion nueva
intent.putExtra(Picto.JSON_ATTTRS.CATEGORY, getIntent().getIntExtra(Picto.JSON_ATTTRS.CATEGORY, -1)); intent.putExtra(Picto.JSON_ATTTRS.CATEGORY, getIntent().getIntExtra(Picto.JSON_ATTTRS.CATEGORY, -1));
intent.putExtra(Picto.JSON_ATTTRS.USER_AVATAR, supAsociado.getText()); intent.putExtra(Picto.JSON_ATTTRS.USER_AVATAR, supAsociado.getText());
...@@ -505,8 +495,6 @@ public class EditPictoActivity extends Activity { ...@@ -505,8 +495,6 @@ public class EditPictoActivity extends Activity {
tareaGrabacion = (RecordTask) new RecordTask().execute(tiempoGrabado); tareaGrabacion = (RecordTask) new RecordTask().execute(tiempoGrabado);
startRecording(); startRecording();
Log.i(DEBUG_MESSAGE,"Grabando..");
return true; return true;
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
tareaGrabacion.cancel(true); tareaGrabacion.cancel(true);
...@@ -523,15 +511,12 @@ public class EditPictoActivity extends Activity { ...@@ -523,15 +511,12 @@ public class EditPictoActivity extends Activity {
botonReproducir.setOnClickListener(new View.OnClickListener() { botonReproducir.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Log.i(DEBUG_MESSAGE,"Click");
if(reproduciendo){ if(reproduciendo){
tareaReproduccion.cancel(true); tareaReproduccion.cancel(true);
reproduciendo = false; reproduciendo = false;
Log.i(DEBUG_MESSAGE,"Parar");
botonReproducir.setImageResource(android.R.drawable.ic_media_play); botonReproducir.setImageResource(android.R.drawable.ic_media_play);
}else{ }else{
reproduciendo = true; reproduciendo = true;
Log.i(DEBUG_MESSAGE,"Reproducir");
tareaReproduccion = (PlayTask) new PlayTask().execute(tiempoTotal); tareaReproduccion = (PlayTask) new PlayTask().execute(tiempoTotal);
startPlaying(); startPlaying();
botonReproducir.setImageResource(android.R.drawable.ic_media_pause); botonReproducir.setImageResource(android.R.drawable.ic_media_pause);
...@@ -545,13 +530,6 @@ public class EditPictoActivity extends Activity { ...@@ -545,13 +530,6 @@ public class EditPictoActivity extends Activity {
borrado = true; borrado = true;
if(hayGrabacion){ if(hayGrabacion){
stopPlaying(); stopPlaying();
/*if(editar){
if(p.getUriSound() != null) {
Log.i(DEBUG_MESSAGE,"Eliminado->"+p.getUriSound());
p.setUriSound(null);
}
}*/
//Log.i(DEBUG_MESSAGE,"Eliminado->"+previewAudioPath);
layoutGrabacion.setVisibility(View.VISIBLE); layoutGrabacion.setVisibility(View.VISIBLE);
layoutPreview.setVisibility(View.GONE); layoutPreview.setVisibility(View.GONE);
hayGrabacion = false; hayGrabacion = false;
......
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