Correction mineur dans BaseGame et Network
This commit is contained in:
parent
f03f061d6f
commit
2e69809178
|
@ -64,8 +64,23 @@ public class BaseGame extends Activity implements OnClickListener {
|
||||||
|
|
||||||
// On initialise la classe permettant la communication avec le serveur.
|
// On initialise la classe permettant la communication avec le serveur.
|
||||||
network = new Network(serverURL, Mode.SIMPLE_GAME, id, passwd);
|
network = new Network(serverURL, Mode.SIMPLE_GAME, id, passwd);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see android.app.Activity#onStart()
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
protected void onStart() {
|
||||||
|
super.onStart();
|
||||||
|
|
||||||
game = network.getGames(1);
|
game = network.getGames(1);
|
||||||
|
runMatch();
|
||||||
|
start();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void runMatch() {
|
||||||
int nbrel = game.getNbRelation();
|
int nbrel = game.getNbRelation();
|
||||||
nbWord = game.getNbWord();
|
nbWord = game.getNbWord();
|
||||||
|
|
||||||
|
@ -153,18 +168,6 @@ public class BaseGame extends Activity implements OnClickListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
((TextView)findViewById(R.id.mainWord)).setText(DownloadedGame.getName(game.getCentre()));
|
((TextView)findViewById(R.id.mainWord)).setText(DownloadedGame.getName(game.getCentre()));
|
||||||
|
|
||||||
//this.helpMode();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* (non-Javadoc)
|
|
||||||
* @see android.app.Activity#onStart()
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
protected void onStart() {
|
|
||||||
super.onStart();
|
|
||||||
|
|
||||||
start();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
|
|
|
@ -1,17 +1,12 @@
|
||||||
package org.pticlic.model;
|
package org.pticlic.model;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.net.URLConnection;
|
import java.net.URLConnection;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.SharedPreferences;
|
|
||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
import android.preference.PreferenceManager;
|
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.stream.JsonReader;
|
import com.google.gson.stream.JsonReader;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user