From 95fc31301ad5ccf9af5a456c72e24dc5f4322120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Hord=C3=A9?= Date: Sun, 17 Jan 2016 23:29:37 +0100 Subject: [PATCH] fix: inclusion des librairies, debogueage sous android, correction de bogues --- core/libs/gdx-sqlite.jar | Bin 0 -> 7010 bytes core/src/fr/evolving/assets/AssetLoader.java | 3 ++- core/src/fr/evolving/assets/Preference.java | 2 +- core/src/fr/evolving/database/LocalBase.java | 10 ++++++++++ core/src/fr/evolving/screens/GameScreen.java | 5 +++++ core/src/fr/evolving/screens/LevelScreen.java | 2 ++ 6 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 core/libs/gdx-sqlite.jar diff --git a/core/libs/gdx-sqlite.jar b/core/libs/gdx-sqlite.jar new file mode 100644 index 0000000000000000000000000000000000000000..ed54801438794f6c6b7e2e2207fef35903568fc6 GIT binary patch literal 7010 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 literal 0 HcmV?d00001 diff --git a/core/src/fr/evolving/assets/AssetLoader.java b/core/src/fr/evolving/assets/AssetLoader.java index 45e57f4..dbfd784 100644 --- a/core/src/fr/evolving/assets/AssetLoader.java +++ b/core/src/fr/evolving/assets/AssetLoader.java @@ -27,7 +27,7 @@ import com.badlogic.gdx.utils.ObjectMap.Values; import com.badlogic.gdx.utils.viewport.FitViewport; import com.badlogic.gdx.utils.viewport.ScalingViewport; import com.badlogic.gdx.utils.viewport.StretchViewport; - +import com.badlogic.gdx.Application; import fr.evolving.automata.Inverter_I; import fr.evolving.automata.Inverter_II; import fr.evolving.automata.Negativer; @@ -222,6 +222,7 @@ public class AssetLoader { Datahandler.RegisterBackend(LocalBase.class); Datahandler.RegisterBackend(SqlBase.class); Databasemanagerfrompref(); + Gdx.app.log("init", "Ok"); } public static void Databasemanagerfrompref() { diff --git a/core/src/fr/evolving/assets/Preference.java b/core/src/fr/evolving/assets/Preference.java index 7125618..c095218 100644 --- a/core/src/fr/evolving/assets/Preference.java +++ b/core/src/fr/evolving/assets/Preference.java @@ -55,7 +55,7 @@ public class Preference { Preference.prefs.putFloat("Music", 0.75f); Preference.prefs.putInteger("Adaptation", 0); Preference.prefs.putInteger("Quality", 2); - Preference.prefs.putInteger("log", Gdx.app.LOG_DEBUG); + Preference.prefs.putInteger("log", Application.LOG_DEBUG); Preference.prefs.flush(); } } diff --git a/core/src/fr/evolving/database/LocalBase.java b/core/src/fr/evolving/database/LocalBase.java index 1b85ab1..7a47ea3 100644 --- a/core/src/fr/evolving/database/LocalBase.java +++ b/core/src/fr/evolving/database/LocalBase.java @@ -317,19 +317,29 @@ public class LocalBase extends Base { public boolean setGrid(int user, int level, Grid data) { String encoded = ""; try { + Gdx.app.log("Base", "Infos:"+user+","+level); ByteArrayOutputStream bos = new ByteArrayOutputStream(); + Gdx.app.log("Base", "CK1"); ObjectOutputStream oos = new ObjectOutputStream(bos); + Gdx.app.log("Base", "CK2"); oos.writeObject(data); + Gdx.app.log("Base", "CK3"); oos.flush(); + Gdx.app.log("Base", "CK4"); oos.close(); bos.close(); byte[] bytes = bos.toByteArray(); + Gdx.app.log("Base", "size"+bytes.length); encoded = Base64Coder.encodeLines(bytes); + Gdx.app.log("Base", "size2"+encoded.length()); dbHandler.rawQuery("insert into grids (user,level,object) values (" + user + "," + level + ",'" + encoded + "');"); + Gdx.app.log("Base", "CK5"); } catch (Exception e) { + Gdx.app.log("Base", "cancel"); return false; } + Gdx.app.log("Base", "Ok"); return true; } diff --git a/core/src/fr/evolving/screens/GameScreen.java b/core/src/fr/evolving/screens/GameScreen.java index a59287a..dabf2e3 100644 --- a/core/src/fr/evolving/screens/GameScreen.java +++ b/core/src/fr/evolving/screens/GameScreen.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.Timer; import java.util.TimerTask; +import com.badlogic.gdx.Application; import com.badlogic.gdx.Application.ApplicationType; import com.badlogic.gdx.Game; import com.badlogic.gdx.Gdx; @@ -197,6 +198,7 @@ public class GameScreen implements Screen { // This is the constructor, not the class declaration public GameScreen(Level alevel) { + Gdx.app.log("game", "Ok"); this.level = alevel; Gdx.app.debug(getClass().getSimpleName(), "Récupération des derniers niveaux."); @@ -865,6 +867,9 @@ public class GameScreen implements Screen { if (winSave.isVisible()) readsaved(); } else if (caller.getName() == "save") { + Gdx.app.log("save", "Ok"); + Gdx.app.debug("Barre", "Sauvegarde de la grille."); + Gdx.app.debug("Barre", AssetLoader.Datahandler.user().toString()); AssetLoader.Datahandler.user().setGrid(0, level.id, level.Grid); readsaved(); } else if (caller.getName() == "levels") { diff --git a/core/src/fr/evolving/screens/LevelScreen.java b/core/src/fr/evolving/screens/LevelScreen.java index 47a1f6f..a01d16a 100644 --- a/core/src/fr/evolving/screens/LevelScreen.java +++ b/core/src/fr/evolving/screens/LevelScreen.java @@ -6,6 +6,7 @@ import java.util.TimerTask; import com.badlogic.gdx.Game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Screen; +import com.badlogic.gdx.Application; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.Stage; @@ -278,6 +279,7 @@ public class LevelScreen implements Screen { } public LevelScreen(int aworld) { + Gdx.app.log("level", "Ok"); this.world = aworld; Gdx.app.debug(getClass().getSimpleName(), "Création des elements primordiaux du screen (stage, renderer, table)");