www

commit 08449d4296b0edcf40a9e721b2089ac55dd01bfa
parent f376caf180fb897622a9247590fdf9005050f9d6
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date:   Sun,  8 May 2011 22:08:38 +0200

Modification du code Java pour la prise en compte des modifs cote serveur

Diffstat:
M
code/PtiClic/src/org/pticlic/FrontPage.java
 | 
2
+-
M
code/PtiClic/src/org/pticlic/Main.java
 | 
8
+++-----
M
code/PtiClic/src/org/pticlic/js/JavaScriptInterface.java
 | 
30
++++++++++++++----------------
M
code/PtiClic/src/org/pticlic/model/Constant.java
 | 
2
+-

4 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/code/PtiClic/src/org/pticlic/FrontPage.java b/code/PtiClic/src/org/pticlic/FrontPage.java
@@ -22,7 +22,7 @@ public class FrontPage extends Activity {
 		webView = (WebView) findViewById(R.id.webview);
 		webView.getSettings().setJavaScriptEnabled(true);
 		
-		js = new JavaScriptInterface(this);
+		js = new JavaScriptInterface(this, webView);
 		webView.addJavascriptInterface(js, "PtiClicAndroid");
 		Log.i("[INFO]", Constant.SERVER + Constant.SERVER_URL);
 		webView.loadUrl(Constant.SERVER + Constant.SERVER_URL);
diff --git a/code/PtiClic/src/org/pticlic/Main.java b/code/PtiClic/src/org/pticlic/Main.java
@@ -5,12 +5,11 @@ import org.pticlic.model.Constant;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.util.Log;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 
 public class Main extends Activity {
-
+	
 	private WebView webView;
 	private JavaScriptInterface js = null;
 	
@@ -26,9 +25,8 @@ public class Main extends Activity {
 		webView.setVerticalScrollBarEnabled(false);
 		webView.setHorizontalScrollBarEnabled(false);
 
-		js = new JavaScriptInterface(this);
+		js = new JavaScriptInterface(this, webView);
 		webView.addJavascriptInterface(js, "PtiClicAndroid");
-		Log.i("[INFO]", Constant.SERVER + Constant.SERVER_URL);	
 	}
 	
 	@Override
@@ -36,7 +34,7 @@ public class Main extends Activity {
 		super.onStart();
 		webView.loadUrl(Constant.SERVER + Constant.SERVER_URL);
 	}
-		
+	
 	@Override
 	public void onBackPressed() {
 		if (js.getScreen().equals("splash") || js.getScreen().equals("frontpage"))
diff --git a/code/PtiClic/src/org/pticlic/js/JavaScriptInterface.java b/code/PtiClic/src/org/pticlic/js/JavaScriptInterface.java
@@ -1,22 +1,24 @@
 package org.pticlic.js;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
-import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import android.webkit.WebView;
+import android.widget.Toast;
 
 public class JavaScriptInterface {
 	private Activity mContext;
 	private ProgressDialog dialog;
 	private String screen;
+	private WebView webView;
 
-    /** Instantie l'interface et initialise le context */
-    public JavaScriptInterface(Activity c) {
+    /** Instantie l'interface et initialise le context */ 
+    public JavaScriptInterface(Activity c, WebView webView) {
         mContext = c;
+        this.webView = webView;
     }
-    
+   
     /**
      * Permet de setter une valeur dans les preferences
      * 
@@ -35,7 +37,8 @@ public class JavaScriptInterface {
      */
     public String getPreference(String aName) {
     	SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-    	return prefs.getString(aName, "");
+    	String res = prefs.getString(aName, "");
+    	return res;
     }
     
     /** Permet d'afficher une progressbar 
@@ -47,16 +50,7 @@ public class JavaScriptInterface {
     }
     
     public void info(String title, String message) {
-    	AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-    	builder.setMessage(message)
-    	       .setCancelable(false)
-    	       .setPositiveButton("OK", new DialogInterface.OnClickListener() {
-    	           public void onClick(DialogInterface dialog, int id) {
-    	                dialog.dismiss();
-    	           }
-    	       });
-    	AlertDialog alert = builder.create();
-    	alert.show();
+    	Toast.makeText(mContext, message, Toast.LENGTH_SHORT);
     }
     
     /** Permet de retirer l'affichage de la boite de dialog
@@ -67,6 +61,10 @@ public class JavaScriptInterface {
         	dialog.dismiss();
     }
     
+    public void switchCSS(String newTheme) {
+    	webView.reload();
+    }
+    
     /** Permet de quitter l'application
      * 
      */
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 = "unstable/code/serveur/php/jeu.html";
+	public static final String SERVER_URL = "unstable/code/serveur/php/jeu.php";
 	public static final String SERVER_AUTH = "SERVER_AUTH";
 	public static final String SERVER = "http://www.pticlic.fr/";