Skip to content

yotta / pictogram

Go to a project
Commit 320a5088 by Arturo Montejo Ráez
Options

Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop

parents 6b5d2786 8d1761cb
Expand all
Inline Side-by-side
Showing with 98 additions and 581 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/PCBDBHelper.java
......@@ -176,11 +176,10 @@ public class PCBDBHelper extends SQLiteOpenHelper {
Cursor cursor = db.rawQuery("SELECT id_stu, id_picto, id_grid, id_child_grid, id_stupicto, url, translation, attributes FROM collection_detail WHERE id_stu = "+id_stu,null);
Log.i(LOG_TAG, "Local recovering " + cursor.getCount() + " pictos for student " + id_stu + " from local DB Scene:"+id_grid);
cursor.moveToFirst();
vocabulary.clear();
if (cursor.getCount()>0) do{
Picto picto = new Picto(cursor.getInt(1), cursor.getString(5),cursor.getInt(4),cursor.getInt(2),cursor.getInt(3),new JSONObject(cursor.getString(7)));
vocabulary.addPicto(picto);
}while (cursor.moveToNext());
cursor.close();
//db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
......@@ -263,7 +262,8 @@ public class PCBDBHelper extends SQLiteOpenHelper {
values.put("url", picto.get_url());
values.put("translation",picto.get_translation());
values.put("attributes",picto.get_json_attrs());
db.insertWithOnConflict("collection_detail", null, values,SQLiteDatabase.CONFLICT_REPLACE);
db.delete("collection_detail","id_grid="+picto.get_grid()+" and id_picto="+ picto.get_ImgId(),null);
db.insertWithOnConflict("collection_detail", null, values,SQLiteDatabase.CONFLICT_ABORT);
}
Log.i(LOG_TAG,"Storage "+n+" pictos for student "+id_stu);
//db.close(); <--no es necesario cerrar la bbdd https://groups.google.com/forum/#!msg/android-developers/NwDRpHUXt0U/jIam4Q8-cqQJ
......@@ -281,7 +281,6 @@ public class PCBDBHelper extends SQLiteOpenHelper {
ContentValues values=new ContentValues(7);
values.put("id_stu", id_stu);
values.put("id_picto", picto.get_ImgId());
//TODO: Añadir aqui el id de escena activa para el estudiante
values.put("id_grid",picto.get_grid());
values.put("id_stupicto",picto.get_stupicto_id());
values.put("url", picto.get_url());
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/Picto.java
......@@ -300,7 +300,8 @@ public class Picto extends Img {
*/
public boolean is_disabled() {
try {
return PCBcontext.getPcbdb().getCurrentUser().is_supervisor() && this.attributes.getString(JSON_ATTTRS.STATUS).equals(JSON_ATTTR_STATUS_VALUES.DISABLED);
//return PCBcontext.getPcbdb().getCurrentUser().is_supervisor() && this.attributes.getString(JSON_ATTTRS.STATUS).equals(JSON_ATTTR_STATUS_VALUES.DISABLED);
return this.attributes.getString(JSON_ATTTRS.STATUS).equals(JSON_ATTTR_STATUS_VALUES.DISABLED);
} catch (JSONException e) {
return false;
}
......@@ -321,13 +322,14 @@ public class Picto extends Img {
*
* @return if the picto is visible
*/
public boolean is_invisible(LinkedList<Integer> visited) {
private boolean is_invisible(LinkedList<Integer> visited) {
boolean visible=!is_invisible1();
if (visible && has_child_grid() && !visited.contains(get_child_grid())) {
visited.add(get_child_grid());
LinkedList<Picto> childs = PCBcontext.getVocabulary().next(get_child_grid());
if (childs==null)
Log.e(LOG_TAG,"Picto "+this.get_legend()+ " with empty grid "+get_child_grid());
visible=false;
else
for (Picto child : childs) {
visible = !child.is_invisible(visited);
......@@ -478,7 +480,7 @@ public class Picto extends Img {
* toString method
*/
public String toString(){
return "(" + get_ImgId() + ") - ["+ get_row() +","+ get_column()+"]" + get_translation() + " - " + get_url() + " --- " + get_json_attrs();
return "( img:" + get_ImgId() + ", grid: "+get_grid()+ ", id:"+get_stupicto_id()+") - ["+ get_row() +","+ get_column()+"]" + get_translation() + " - " + get_url() + " --- " + get_json_attrs()+"."+super.toString();
}
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java
......@@ -63,16 +63,15 @@ public class Vocabulary implements Iterable<Picto> {
VocabularyTalk.iVocabularyListener vocabulary_listeners[] = {new VocabularyTalk.iVocabularyListener() {
@Override
public void change(action action, int picto_grid, int picto_id, int id_child_grid, JSONObject args) {
switch (action) {
case delete: {
Log.i(this.getClass().getCanonicalName(), "Picto delete "+picto_grid+"."+picto_id);
Log.i(LOG_TAG, "Picto delete "+picto_grid+"."+picto_id);
removePicto(picto_grid,picto_id);
break;
}
case update:{
Log.i(this.getClass().getCanonicalName(), "Picto update "+args.toString());
Log.i(LOG_TAG, "Vocabulary action listened (vocabulary model): " + action);
try {
modifyAttsPicto(picto_grid, picto_id, args.getJSONObject("attributes"), id_child_grid);
} catch (JSONException e) {
......@@ -121,7 +120,7 @@ public class Vocabulary implements Iterable<Picto> {
public void synchronize() {
VocabularyDownloader downloader = new VocabularyDownloader(this,this.pictos,this.imgListener);
VocabularyDownloader downloader = new VocabularyDownloader(this,this.imgListener);
downloader.synchronize();
}
//public boolean is_category(Picto p) {return this.pictos.containsKey(p.get_ImgId()); }
......@@ -136,11 +135,13 @@ public class Vocabulary implements Iterable<Picto> {
public void addPictoAndSave(Picto pic, ImgDownloader.tsource source, ImgDownloader.iImgDownloaderListener imgListener){
Vector<Img> imgs=new Vector<Img>(1);
if (pic.is_local()) addPicto(pic);
imgs.add(pic);
ImgDownloader downloader = new ImgDownloader(PCBcontext.getContext(), imgListener,source);
downloader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, imgs);
if (!pic.local_update()) addPicto(pic);
PCBcontext.getPcbdb().savePicto(pic);
}
......@@ -155,7 +156,8 @@ public class Vocabulary implements Iterable<Picto> {
int index=-1;
if (pictos_cat!=null)
for (int i=0; i<pictos_cat.size() && index==-1; i++)
if (pictos_cat.get(i).get_ImgId()==pic_id) index=i;
if (pictos_cat.get(i).get_ImgId()==pic_id)
index=i;
return index;
}
......@@ -248,13 +250,18 @@ public class Vocabulary implements Iterable<Picto> {
*/
public void addPicto(Picto picto) {
LinkedList<Picto> pictos_grid;
if (find_picto_index(picto.get_grid(),picto.get_ImgId())>-1)
Log.e(LOG_TAG,"********ADDING PICTO DUPLICATED!!!!!!!!!!! "+picto);
else {
if (this.pictos.containsKey(picto.get_grid()))
pictos_grid = pictos.get(picto.get_grid());
else {
pictos_grid = new LinkedList();
this.pictos.put(new Integer(picto.get_grid()),pictos_grid);
this.pictos.put(new Integer(picto.get_grid()), pictos_grid);
}
pictos_grid.add(picto);
}
}
......@@ -368,4 +375,8 @@ public class Vocabulary implements Iterable<Picto> {
return vocabulary;
}
public void clear() {
this.pictos.clear();
}
}
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/NetService.java
......@@ -37,7 +37,8 @@ import java.util.concurrent.TimeUnit;
public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
private static final String LOG_TAG=NetService.class.getCanonicalName();
private static final String ping_session="server/ping";
private static final String ping_session="server/ping_session";
private static final String ping="server/ping";
private boolean updated;
private final Vector<iNetServiceStatus> listeners;
......@@ -46,13 +47,12 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
private long nextRestfullSynchro;
private long nextServerPing;
public NetService(iNetServiceStatus listener) {
this.updated=RestapiWrapper.ping(PCBcontext.getContext().getResources().getString(R.string.server), ping_session);
RestapiWrapper.ping(PCBcontext.getContext().getResources().getString(R.string.server), ping);
this.updated=false;
nextServerPing=0;
this.listeners = new Vector<>(2);
this.listeners.add(listener);
if (listener instanceof iNetServiceDevice) ((iNetServiceDevice)listener).build();
Log.i(LOG_TAG, "Checking Pictogram server access...");
Log.i(LOG_TAG, this.updated ? "Pictogram server access ok" : "Pictogram server access failed, Internet connection available?");
ScheduledThreadPoolExecutor exec = new ScheduledThreadPoolExecutor(1);
exec.scheduleWithFixedDelay(this, 0, PCBcontext.getContext().getResources().getInteger(R.integer.netservice_timing), TimeUnit.SECONDS);
}
......@@ -151,19 +151,17 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
public void run() {
try {
ConnectivityManager cm =
(ConnectivityManager)PCBcontext.getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
(ConnectivityManager) PCBcontext.getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
boolean isConnected = activeNetwork != null && activeNetwork.isConnectedOrConnecting();
if (!isConnected) {
if (!isConnected)
setOffline(new NetworkErrorException("No Internet access"));
return;
}
long now = new Date().getTime();
if ( (now < nextServerPing)) return;
nextServerPing=now+serverPingTimming;
PCBcontext.getRestapiWrapper().ask(ping_session, new RestapiWrapper.iRestapiListener() {
else {
final long now = new Date().getTime();
if (now >= nextServerPing || !updated) {
nextServerPing = now + serverPingTimming;
PCBcontext.getRestapiWrapper().ask(updated ? ping_session : ping, new RestapiWrapper.iRestapiListener() {
@Override
public void preExecute() {
......@@ -172,63 +170,63 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
@Override
public void result(JSONArray result) {
}
@Override
public void result(final JSONObject result) {
try {
final float version = ((float)(Float.valueOf(result.getString("version")).intValue()*10))/10;
final float version = ((float) (Float.valueOf(result.getString("version")).intValue() * 10)) / 10;
if (PCBcontext.getActivityContext() != null && version > DeviceHelper.getAppVersion() && newVersionContext!=PCBcontext.getActivityContext()) {
newVersionContext=PCBcontext.getActivityContext(); // prevent from showing several times the alert
newVersionAlert(version,PCBcontext.getActivityContext(), version);
if (PCBcontext.getActivityContext() != null && version > DeviceHelper.getAppVersion() && newVersionContext != PCBcontext.getActivityContext()) {
newVersionContext = PCBcontext.getActivityContext(); // prevent from showing several times the alert
newVersionAlert(version, PCBcontext.getActivityContext(), version);
}
} catch (Exception e) {
Log.e(LOG_TAG, "PING JSON ERROR: " + result + " " + e.getMessage());
}
long now = new Date().getTime();
if (!updated) {
nextRestfullSynchro = now;
updated = true;
String TAG_TOKEN="token";
try {
PCBcontext.getRestapiWrapper().setToken(result.getString(TAG_TOKEN));
} catch (JSONException e) {
Log.e(LOG_TAG,"Error when getting token:"+e.getMessage()+" res:"+result.toString());
}
setOnline();
if (PCBcontext.is_user_logged()) //si el usuario aun no hizo login, en realidad no es necesario hacer nada
// Comprobar si hay usuario offline, para hacer login transparente
if (PCBcontext.is_user_offline())
login();
else if (PCBcontext.is_user_online()) {
PCBcontext.getRoom().connect();
synchronizeStuData();
PCBcontext.getActionLog().batch();
};
}
} else {
try {
PCBcontext.getRestapiWrapper().setToken(result.getString("token"));
Log.i(LOG_TAG, "session token updated");
} catch (JSONException e) {
Log.e(LOG_TAG, "Error when ping:" + e.getMessage() + " res:" + result.toString());
}
//cada restfullSynchroTimming aprox. se fuerza sincronización de vocabulario y configuración de usuario
if (PCBcontext.is_user_logged()) {
if (restfullSynchroTimming > 0 && (now >= nextRestfullSynchro)) {
Log.i(LOG_TAG, "Vocabulary request.");
if(!PCBcontext.getRoom().inRoom()){
if (!PCBcontext.getRoom().inRoom()) {
PCBcontext.getRoom().connect();
}
synchronizeStuData();
nextSynchro(now+restfullSynchroTimming);
nextSynchro(now + restfullSynchroTimming);
}
} else nextSynchro(now+restfullSynchroTimming);
} else nextSynchro(now + restfullSynchroTimming);
}
}
@Override
public void error(RestapiWrapper.HTTPException e) {
Log.e(LOG_TAG, "Error when PING asking:" + e.getMessage()+" .Ping session?"+!updated);
setOffline(e);
}
});
notifyStatus();
}catch(Exception e) {
Log.e(LOG_TAG,"THREAD NOT WORKING BECAUSE:"+e.getMessage());
}
}
}catch(Exception e){
Log.e(LOG_TAG, "THREAD NOT WORKING BECAUSE:" + e.getMessage());
this.restart_app(true);
}
}
......@@ -272,6 +270,7 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
@Override
public void error(RestapiWrapper.HTTPException e) {
Log.e(LOG_TAG, "Raw error from server when getting student info:" + e.getMessage() + " (error " + e.getCode() + ")");
restart_app(false);
}
});
}
......@@ -287,10 +286,18 @@ public class NetService implements Runnable, RestapiWrapper.iSilentLogin {
public void setOffline(Exception e) {
this.updated=false;
//PCBcontext.getRoom().exit();
Log.e(LOG_TAG, "PCB offline because exception happens: " + e.getMessage());
notifyStatus();
}
public void setOnline() {
this.updated=true;
Log.i(LOG_TAG, "PCB online");
notifyStatus();
}
public iNetServiceDevice getNetServiceDevice() {
iNetServiceDevice device=null;
for (iNetServiceStatus listener: listeners)
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/PictoUploader.java
......@@ -356,6 +356,7 @@ public class PictoUploader {
exists_local_img=false;
PCBcontext.getPcbdb().savePicto(this.picto);
PCBcontext.getVocabulary().addPicto(this.picto);
PCBcontext.getRoom().emit(new VocabularyAction(VocabularyAction.ADD, this.picto));
}
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/VocabularyDownloader.java
......@@ -17,8 +17,6 @@ import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.util.Hashtable;
import java.util.LinkedList;
import java.util.Vector;
/**
......@@ -28,21 +26,22 @@ import java.util.Vector;
public class VocabularyDownloader {
private static final String LOG_TAG = VocabularyDownloader.class.getSimpleName();
Vocabulary vocabulary;
Hashtable<Integer,LinkedList<Picto>> pictos;
ImgDownloader.iImgDownloaderListener imgListener;
public VocabularyDownloader(Vocabulary vocabulary, Hashtable<Integer, LinkedList<Picto>> pictos, ImgDownloader.iImgDownloaderListener imgListener) {
public VocabularyDownloader(Vocabulary vocabulary, ImgDownloader.iImgDownloaderListener imgListener) {
this.vocabulary=vocabulary;
this.pictos=pictos;
this.imgListener=imgListener;
}
public void synchronize() {
if (TransactionMonitor.getDBOnTransaction()!=null) {
Log.e(LOG_TAG,"Vocabulary synchronization aborted because the previous Transaction is not finished");
return;
}
synchronize_upload(new PictoUploader.iDeletedOnServer() {
@Override
public void ok(int npictos) {
pictos.clear();
vocabulary.clear();
TransactionMonitor.startTransaction(PCBcontext.getPcbdb());
PCBcontext.getPcbdb().deleteVocabulary(TransactionMonitor.getDBOnTransaction());
if (npictos>0)
Toast.makeText(
PCBcontext.getActivityContext(),
......@@ -96,14 +95,14 @@ public class VocabularyDownloader {
@Override
public void result(JSONObject result) {
downloaded_scenes.add(id_grid);
if (result != null && PCBcontext.is_user_logged()) {
JSONObject picto, attributes;
JSONObject stupicto = null;
try {
JSONArray stu_pictos = result.getJSONArray("pictos"); //Obtengo el JSONArray de los stupictos
Picto[] pictos_list = new Picto[stu_pictos.length()];
downloaded_scenes.add(result.getInt("id"));
for (int i = 0; i < stu_pictos.length(); i++) {
stupicto = stu_pictos.getJSONObject(i);
picto = stupicto.getJSONObject("picto");
......@@ -161,9 +160,7 @@ public class VocabularyDownloader {
private void synchronizeImgs(Picto updated_collection[]) throws JSONException {
Vector<Img> imgs=new Vector<Img>(updated_collection.length);
for (Picto updated_picto: updated_collection) {
LinkedList<Picto> pictos_grid;
Picto picto = new Picto(updated_picto.get_ImgId(),
updated_picto.get_url(),
updated_picto.get_stupicto_id(),
......@@ -171,14 +168,7 @@ public class VocabularyDownloader {
updated_picto.get_child_grid(),
updated_picto.get_translation(),
updated_picto.get_json_attrs());
if (pictos.containsKey(new Integer(picto.get_grid()))) {
pictos_grid = pictos.get(picto.get_grid());
}else {
pictos_grid = new LinkedList<>();
pictos.put(picto.get_grid(),pictos_grid);
}
pictos_grid.add(picto);
vocabulary.addPicto(picto);
imgs.add(picto);
}
......@@ -195,13 +185,13 @@ public class VocabularyDownloader {
* TODO: keep record of failed uploaded images to re-include as local pictos
*/
private void synchronize_upload(final PictoUploader.iDeletedOnServer deleted_pictos) {
try {
if (this.pictos.isEmpty())
if (vocabulary.size()==0)
PCBcontext.getPcbdb().getStudentVocabulary(vocabulary);
} catch (JSONException e) {
Log.e(this.getClass().getName(), " Picto json error from local storage: " + e.getMessage());
}
Vector<Picto> pictos_to_be_removed=new Vector<>(3);
for (Picto picto: vocabulary) {
if (picto.is_deleted())
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/Room.java
......@@ -33,13 +33,15 @@ public class Room {
private SailsSocketsIO socket=null;
private boolean inRoom=false;
private final Hashtable<String, Emitter.Listener> listeners;
public Room( ) {
Log.i(this.getClass().getName(), "Entering room");
listeners=new Hashtable<>();
listeners.put("disconnect", new Emitter.Listener() {
@Override
public void call(Object... args) {
Log.e(LOG_TAG,"******************Websockect disconnect");
Log.e(LOG_TAG,"Websockect disconnect");
PCBcontext.getNetService().setOffline(new SocketIOException("Websocket connection is lost"));
}
});
......@@ -102,10 +104,12 @@ public class Room {
this.listeners.put(msg, listener);
}
private void listen_again() {
for (String msg: this.listeners.keySet()) {
Log.e(this.getClass().getName(), "******************************Listening to "+msg);
if (this.socket!=null) {
this.socket.unregisterMessage(msg);
this.socket.registerMessage(msg, this.listeners.get(msg));
}else Log.e(this.getClass().getName(), "NULL socket when listening to " + msg);
}
}
......@@ -119,11 +123,9 @@ public class Room {
}
}
private void unlisten() {
for (String msg: this.listeners.keySet()) {
Log.i(this.getClass().getName(), "Unlistening to "+msg);
for (String msg: this.listeners.keySet())
this.socket.unregisterMessage(msg);
}
}
private void unsubscribe() {
try {
......@@ -138,8 +140,8 @@ public class Room {
Log.i(this.getClass().getName(), "Leaving room");
unlisten();
unsubscribe();
this.socket.destroy();
this.socket=null;
//this.socket.destroy();
//this.socket=null;
}
}
......@@ -147,7 +149,7 @@ public class Room {
super.finalize();
Log.i(this.getClass().getName(), "Discarding room");
Log.e(LOG_TAG,"Websocket connection is lost because ojbect is finalized");
PCBcontext.getNetService().setOffline(new SocketIOException("Websocket connection is lost because ojbect is finalized"));
PCBcontext.getNetService().setOffline(new SocketIOException("Websocket connection is lost because object is finalized"));
exit();
}
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/StudentTalk.java
......@@ -33,7 +33,7 @@ public class StudentTalk implements Emitter.Listener {
try {
JSONObject msg=((JSONObject) args[0]).getJSONObject("student");
if (lastTalk!=null && lastTalk.equals(msg.toString())) {
Log.e(LOG_TAG, "********************************Message from server duplicated!");
Log.e(LOG_TAG, "Message from server duplicated!");
return;
}
lastTalk=msg.toString();
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/Img.java
......@@ -188,5 +188,5 @@ public class Img {
/**
* @overide
*/
public String toString() {return this.type+"."+this.id;}
public String toString() {return this.type+"."+this.id+"."+super.toString();}
}
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java
......@@ -124,15 +124,17 @@ public final class PCBcontext {
}
public static void unset_user() {
Log.e(PCBcontext.class.getCanonicalName(), "User unset. Student " + getPcbdb().getCurrentUser().get_name_stu());
Log.i(PCBcontext.class.getCanonicalName(), "User unset. Student " + getPcbdb().getCurrentUser().get_name_stu());
if (room!=null) room.exit();
if (TransactionMonitor.getDBOnTransaction()!=null) {
Log.e(LOG_TAG, "Unset when transaction is active, aborting transaction");
TransactionMonitor.endTransaction(false);
}
pcbdb = null;
room = null;
//room = null;
vocabulary = null;
studentTalk = null;
getNetService().notifyStatus();
}
@Override
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tts/TTSHelper.java
......@@ -150,7 +150,7 @@ public class TTSHelper {
public void play(String input) {
Bundle params = new Bundle();
params.putString(TextToSpeech.Engine.KEY_PARAM_VOLUME, "1");
params.putFloat(TextToSpeech.Engine.KEY_PARAM_VOLUME, new Float(1));
params.putString(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "TAPE_READ");
ttobj.speak(input, TextToSpeech.QUEUE_FLUSH, params, "TAPE_READ");
}
......
android/Pictogram/communicator/build/generated/res/resValues/androidTest/DevFlavor/debug/values/generated.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Automatically generated file. DO NOT MODIFY -->
<!-- Values from product flavor: DevFlavor -->
<string name="apk" translatable="false">pictogram_dev.apk</string>
<string name="server" translatable="false">https://dev.pictogramweb.com</string>
<bool name="ssl_connect">false</bool>
<!-- Values from default config. -->
<bool name="NotifyAllwaysVisible">true</bool>
<string name="VersionManagerClass" translatable="false">com.yottacode.pictogram.communicator.VersionManager</string>
</resources>
android/Pictogram/communicator/build/intermediates/blame/res/DevFlavor/debug/multi/values-h720dp-v13.json deleted 100644 → 0
[
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-h720dp-v13\\values-h720dp-v13.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-h720dp-v13\\values-h720dp-v13.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 66,
"endOffset": 117
}
}
}
]
}
]
\ No newline at end of file
android/Pictogram/communicator/build/intermediates/blame/res/DevFlavor/debug/multi/values-hdpi-v4.json deleted 100644 → 0
[
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-hdpi-v4\\values-hdpi-v4.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-hdpi-v4\\values-hdpi-v4.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endLine": 6,
"endColumn": 13,
"endOffset": 327
}
}
}
]
}
]
\ No newline at end of file
android/Pictogram/communicator/build/intermediates/blame/res/DevFlavor/debug/multi/values-land.json deleted 100644 → 0
[
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
}
}
},
{
"to": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
}
}
},
{
"to": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
}
}
},
{
"to": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
}
}
},
{
"to": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
}
}
},
{
"to": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
}
}
},
{
"to": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-land\\values-land.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 69,
"endOffset": 120
}
}
},
{
"to": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 3,
"startColumn": 4,
"startOffset": 125,
"endColumn": 63,
"endOffset": 184
}
}
},
{
"to": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 4,
"startColumn": 4,
"startOffset": 189,
"endColumn": 70,
"endOffset": 255
}
}
},
{
"to": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-land\\values-land.xml",
"position": {
"startLine": 5,
"startColumn": 4,
"startOffset": 260,
"endColumn": 67,
"endOffset": 323
}
}
}
]
}
]
\ No newline at end of file
android/Pictogram/communicator/build/intermediates/blame/res/DevFlavor/debug/multi/values-ldltr-v21.json deleted 100644 → 0
[
{
"outputFile": "C:\\home\\german\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
},
"from": {
"file": "C:\\home\\german\\.android\\build-cache\\116ba476ffe1c97e7a1f57d6511e4139a0deeca9\\output\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\Git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\4b93b66b05cee2131eef68820393b824c2f2a3a6\\output\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
}
}
}
]
},
{
"outputFile": "C:\\Users\\Fernando\\git\\pictogram\\android\\Pictogram\\communicator\\build\\intermediates\\incremental\\mergeDevFlavorDebugResources\\merged.dir\\values-ldltr-v21\\values-ldltr-v21.xml",
"map": [
{
"to": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
},
"from": {
"file": "C:\\Users\\Fernando\\.android\\build-cache\\17fa1970374ae1714f0d4f5c4dd1f5f61d6601bf\\output\\res\\values-ldltr-v21\\values-ldltr-v21.xml",
"position": {
"startLine": 2,
"startColumn": 4,
"startOffset": 55,
"endColumn": 112,
"endOffset": 163
}
}
}
]
}
]
\ 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