www

commit 5c8bc3f4c2d72fa4307c18269819c78829b264fb
parent 23d19da471c3bbeb1d6e283e45970972bdddeda2
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date:   Wed, 27 Apr 2011 09:42:24 +0200

Ajout d'un spinner au demarrage

Diffstat:
M
code/PtiClic/src/org/pticlic/FrontPage.java
 | 
9
++++++---
M
code/PtiClic/src/org/pticlic/model/Constant.java
 | 
2
+-
M
code/serveur/php/ressources/pticlic.js
 | 
3
++-

3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/code/PtiClic/src/org/pticlic/FrontPage.java b/code/PtiClic/src/org/pticlic/FrontPage.java
@@ -11,6 +11,7 @@ import android.webkit.WebView;
 public class FrontPage extends Activity {
 
 	private WebView webView;
+	private JavaScriptInterface js = null;
 	
 	/** Called when the activity is first created. */
 	@Override
@@ -22,13 +23,15 @@ public class FrontPage extends Activity {
 		WebSettings webSettings = webView.getSettings();
 		webSettings.setJavaScriptEnabled(true);
 		
-		webView.addJavascriptInterface(new JavaScriptInterface(this), "PtiClicAndroid");
+		js = new JavaScriptInterface(this);
+		js.show("PtiClic", "Démarrage de l'application");
+		webView.addJavascriptInterface(js, "PtiClicAndroid");
 		webView.loadUrl(Constant.SERVER + Constant.SERVER_URL);
 	}
-
+	
 	@Override
 	public void onBackPressed() {
-		System.exit(0);
+		webView.goBack();
 	}
 
 }
diff --git a/code/PtiClic/src/org/pticlic/model/Constant.java b/code/PtiClic/src/org/pticlic/model/Constant.java
@@ -1,7 +1,7 @@
 package org.pticlic.model;
 
 public class Constant {
-	public static final String SERVER_URL = "html5/code/html5/";
+	public static final String SERVER_URL = "unstable/code/serveur/php/jeu.html";
 	public static final String SERVER_AUTH = "SERVER_AUTH";
 	public static final String SERVER = "http://www.pticlic.fr/";
 	
diff --git a/code/serveur/php/ressources/pticlic.js b/code/serveur/php/ressources/pticlic.js
@@ -114,7 +114,6 @@ if (PtiClicAndroid) {
 // ==== Code métier général
 $(function() {
 	$(window).resize(jss);
-	jss();
 	frontpage();
 });
 
@@ -129,6 +128,8 @@ function frontpage() {
 	$("#frontpage .frontpage-button.game").click(function(){
 		getGame();
 	});
+	jss();
+	UI.dismiss();
 }
 
 // ==== Code métier pour le jeu