suzanne.soy/2011-m1s2-ter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'html5' of github:jsmaniac/2011-m1s2-ter into unstable

Browse Source 
Conflicts:
	code/serveur/php/server.php
	organisation/notes
This commit is contained in:
Georges Dupéron 2011-04-10 14:18:10 +02:00
commit d8aedf04b9
45 changed files with 744 additions and 1560 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
code/PtiClic/AndroidManifest.xml
View File

@ -1,24 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.pticlic"
android:versionCode="1" android:versionName="@string/version">
<application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar" android:debuggable="true">
<activity android:name=".Main" android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
package="org.pticlic" android:versionCode="1" android:versionName="@string/version">
<application android:icon="@drawable/icon" android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar" android:debuggable="true">
<activity android:name=".Main" android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".Preference" android:label="Préférence" android:screenOrientation="portrait"></activity>
<activity android:name=".games.BaseGame" android:screenOrientation="portrait"></activity>
<activity android:label="Information" android:name=".Information" android:screenOrientation="portrait"></activity>
<activity android:name="BaseScore" android:label="Score" android:screenOrientation="portrait"></activity>
<activity android:name="FrontPage" android:screenOrientation="portrait"></activity>
</application>
<activity android:name=".Preference" android:label="Préférence"
android:screenOrientation="portrait"></activity>
<activity android:label="Information" android:name=".Information"
android:screenOrientation="portrait"></activity>
<activity android:name="FrontPage" android:screenOrientation="portrait">
</activity>
</application>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
</manifest>

2
code/PtiClic/proguard.cfg
View File

@ -10,6 +10,8 @@
-keep public class * extends android.app.Service
-keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider
-keep public class * extends android.app.backup.BackupAgentHelper
-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService
-keepclasseswithmembernames class * {

104
code/PtiClic/res/layout/basegame.xml
View File

@ -1,104 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_width="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout android:layout_width="fill_parent"
android:layout_height="fill_parent" android:orientation="vertical"
android:layout_weight="2">
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:orientation="horizontal" android:paddingTop="10dip">
<TextView android:id="@+id/wordRemaining" android:text="0/10"
android:textStyle="bold" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:paddingRight="5dip" android:paddingTop="10dip" android:paddingLeft="13dip">
</TextView>
<TextView android:id="@+id/mainWord" android:textStyle="bold" android:textSize="30dip"
android:layout_weight="1" android:layout_width="fill_parent" android:paddingBottom="10dip" android:layout_height="90dip" android:gravity="top|center_vertical|center_horizontal" android:text="Un truc super long">
</TextView>
<ImageView android:src="@drawable/aide" android:id="@+id/aideBaseGame"
android:paddingRight="10px" android:layout_width="wrap_content"
android:layout_height="wrap_content"></ImageView>
</LinearLayout>
<TextView android:id="@+id/currentWord" android:layout_width="fill_parent"
android:text="currentWord" android:textStyle="bold" android:textSize="20dip"
android:layout_height="fill_parent" android:gravity="top|center">
</TextView>
</LinearLayout>
<LinearLayout android:layout_height="fill_parent"
android:layout_width="fill_parent" android:orientation="horizontal" android:id="@+id/menuLayout" android:layout_weight="8">
<LinearLayout android:layout_height="wrap_content"
android:layout_width="fill_parent" android:orientation="horizontal"
android:id="@+id/relation1Layout" android:layout_weight="1"
android:layout_gravity="center" android:clickable="true">
<ImageView android:id="@+id/relation1" android:src="@drawable/contenant"
android:layout_weight="1" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginLeft="10dip">
</ImageView>
<TextView android:id="@+id/relation1Name"
android:text="contenant"
android:textStyle="bold" android:textSize="15dip"
android:layout_height="wrap_content" android:layout_weight="3"
android:layout_gravity="center_vertical" android:visibility="gone" android:layout_width="fill_parent" android:gravity="center">
</TextView>
</LinearLayout>
<LinearLayout android:layout_height="wrap_content"
android:layout_width="fill_parent" android:orientation="horizontal"
android:id="@+id/relation2Layout" android:layout_weight="1"
android:layout_gravity="center" android:clickable="true">
<ImageView android:id="@+id/relation2" android:src="@drawable/contenu"
android:layout_weight="1" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginLeft="10dip">
</ImageView>
<TextView android:id="@+id/relation2Name"
android:text="contenu"
android:textStyle="bold" android:textSize="15dip"
android:layout_height="wrap_content" android:layout_weight="3"
android:layout_gravity="center_vertical" android:visibility="gone" android:layout_width="fill_parent" android:gravity="center">
</TextView>
</LinearLayout>
<LinearLayout android:layout_height="wrap_content"
android:layout_width="fill_parent" android:orientation="horizontal"
android:id="@+id/relation3Layout" android:layout_weight="1"
android:layout_gravity="center" android:clickable="true">
<ImageView android:id="@+id/relation3" android:src="@drawable/contraire"
android:layout_weight="1" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_marginLeft="10dip">
</ImageView>
<TextView android:id="@+id/relation3Name"
android:text="contraire"
android:textStyle="bold" android:textSize="15dip"
android:layout_height="wrap_content" android:layout_weight="3"
android:layout_gravity="center_vertical" android:visibility="gone" android:layout_width="fill_parent" android:gravity="center">
</TextView>
</LinearLayout>
<LinearLayout android:layout_height="wrap_content"
android:layout_width="fill_parent" android:orientation="horizontal"
android:id="@+id/relation4Layout" android:layout_weight="1"
android:layout_gravity="center" android:clickable="true">
<ImageView android:id="@+id/relation4" android:src="@drawable/synonyme"
android:layout_weight="1" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_gravity="center" android:layout_marginLeft="10dip">
</ImageView>
<TextView android:id="@+id/relation4Name"
android:text="synonyme"
android:textStyle="bold" android:textSize="15dip"
android:layout_height="wrap_content" android:layout_weight="3"
android:layout_gravity="center_vertical" android:visibility="gone" android:layout_width="fill_parent" android:gravity="center">
</TextView>
</LinearLayout>
</LinearLayout>
</LinearLayout>

45
code/PtiClic/res/layout/frontpage.xml
View File

@ -1,41 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical">
<TextView android:text="@string/app_name" android:id="@+id/logo"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:textSize="50px" android:layout_weight="1" />
<RelativeLayout android:layout_height="wrap_content"
android:id="@+id/RelativeLayout01" android:layout_width="wrap_content"
android:layout_gravity="bottom|center_horizontal">
<ImageView android:layout_height="wrap_content"
android:text="@string/play_label" android:layout_width="wrap_content"
android:id="@+id/play" android:clickable="true" android:padding="30dip"
android:src="@drawable/mode_normal"/>
<ImageView android:src="@drawable/config"
android:layout_height="wrap_content" android:id="@+id/prefs"
android:layout_width="wrap_content" android:layout_below="@+id/play"
android:layout_alignLeft="@+id/play" android:layout_alignRight="@+id/play"
android:padding="30dip"></ImageView>
</RelativeLayout>
<LinearLayout android:id="@+id/LinearLayout01"
android:layout_height="wrap_content" android:layout_width="fill_parent"
android:orientation="vertical" android:layout_weight="1">
<TextView android:layout_height="wrap_content"
android:layout_width="fill_parent" android:textStyle="bold"
android:gravity="center_horizontal" android:text="@+id/login"
android:id="@+id/login"></TextView>
<ImageView android:layout_height="wrap_content" android:id="@+id/infoButton"
android:layout_width="wrap_content" android:layout_gravity="right"
android:layout_weight="5" android:clickable="true" android:src="@drawable/aide" android:paddingRight="10px"/>
</LinearLayout>
</LinearLayout>
<WebView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/webview"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
/>

76
code/PtiClic/res/layout/score.xml
View File

@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="fill_parent" android:orientation="vertical"
android:id="@+id/LinearLayout01" android:layout_gravity="center"
android:layout_width="fill_parent">
<LinearLayout android:layout_width="fill_parent"
android:layout_height="wrap_content" android:id="@+id/linearLayout2"
android:orientation="vertical" android:layout_weight="2">
<TextView android:layout_width="fill_parent" android:id="@+id/textView1"
android:layout_height="wrap_content" android:text="@string/score_your_score"
android:gravity="center|bottom" android:layout_weight="1" android:textSize="25dip"
android:textStyle="bold"></TextView>
<TextView android:layout_width="fill_parent" android:id="@+id/total"
android:layout_height="wrap_content" android:text="@+id/total"
android:textStyle="bold" android:textSize="25dip"
android:layout_weight="1" android:gravity="center|top"></TextView>
<TextView android:layout_width="fill_parent" android:id="@+id/textView1"
android:layout_height="wrap_content" android:text="@string/score_your_answers"
android:gravity="center|bottom" android:layout_weight="0.1"
android:textSize="25dip" android:textStyle="bold"></TextView>
<TextView android:layout_width="fill_parent" android:id="@+id/textView1"
android:layout_height="wrap_content" android:text="@string/score_explanation"
android:gravity="center|top" android:layout_weight="1"
android:textSize="15dip"></TextView>
<TextView android:layout_height="wrap_content" android:id="@+id/scoreRel1"
android:text="@+id/scoreRel1" android:layout_width="fill_parent"
android:textStyle="bold" android:paddingLeft="10dip"></TextView>
<TextView android:layout_height="wrap_content" android:id="@+id/scoreWords1"
android:layout_width="fill_parent" android:paddingLeft="30dip"
android:text="@+id/scoreWords1" android:paddingBottom="5dip"></TextView>
<TextView android:layout_height="wrap_content" android:id="@+id/scoreRel2"
android:text="@+id/scoreRel2" android:layout_width="fill_parent"
android:textStyle="bold" android:paddingLeft="10dip"></TextView>
<TextView android:layout_height="wrap_content" android:id="@+id/scoreWords2"
android:text="@+id/scoreWords2" android:layout_width="fill_parent"
android:paddingLeft="30dip" android:paddingBottom="5dip"></TextView>
<TextView android:layout_height="wrap_content" android:id="@+id/scoreRel3"
android:text="@+id/scoreRel3" android:layout_width="fill_parent"
android:textStyle="bold" android:paddingLeft="10dip"></TextView>
<TextView android:layout_height="wrap_content" android:id="@+id/scoreWords3"
android:text="@+id/scoreWords3" android:layout_width="fill_parent"
android:paddingLeft="30dip" android:paddingBottom="5dip"></TextView>
<TextView android:layout_height="wrap_content" android:id="@+id/scoreRel4"
android:text="@+id/scoreRel4" android:layout_width="fill_parent"
android:textStyle="bold" android:paddingLeft="10dip"></TextView>
<TextView android:layout_height="wrap_content" android:id="@+id/scoreWords4"
android:text="@+id/scoreWords4" android:layout_width="fill_parent"
android:paddingLeft="30dip" android:paddingBottom="5dip"></TextView>
</LinearLayout>
<LinearLayout android:id="@+id/linearLayout1"
android:layout_weight="1" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:gravity="center_horizontal"
android:paddingTop="20dip">
<Button android:id="@+id/saw" android:text="J'ai vu !"
android:layout_height="wrap_content" android:layout_gravity="top"
android:layout_width="150dip"></Button>
</LinearLayout>
</LinearLayout>

149
code/PtiClic/src/org/pticlic/BaseScore.java
View File

@ -1,149 +0,0 @@
package org.pticlic;
import org.pticlic.R.string;
import org.pticlic.exception.PtiClicException;
import org.pticlic.model.Constant;
import org.pticlic.model.DownloadedBaseGame;
import org.pticlic.model.Match;
import org.pticlic.model.Network;
import org.pticlic.model.Network.Mode;
import org.pticlic.model.Network.ScoreResponse;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.TextView;
/**
* @author John CHARRON
*
* Permet l'affichage du score obtenu par le joueur lors de sa partie.
*/
public class BaseScore extends Activity implements OnClickListener{
private Match gamePlayed;
private ScoreResponse sr = null;
private void networkStuff() {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
String id = sp.getString(Constant.USER_ID, "joueur");
String passwd = sp.getString(Constant.USER_PASSWD, "");
String serverURL = sp.getString(Constant.SERVER_URL, Constant.SERVER);
Mode mode = null;
if (getIntent().getExtras() != null) {
// GamePlayed contient toutes les infos sur la partie jouee
this.gamePlayed = (Match) getIntent().getExtras().get(Constant.SCORE_GAMEPLAYED);
mode = (Mode) getIntent().getExtras().get(Constant.SCORE_MODE);
}
// TODO : factoriser le serverUrl dans Network
sp.edit().remove(Constant.NEW_BASE_GAME).commit();
Network network = new Network(serverURL, mode, id, passwd);
try {
sr = network.sendBaseGame(gamePlayed);
sp.edit().putString(Constant.NEW_BASE_GAME, sr.getNewGame()).commit();
} catch (PtiClicException e) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.app_name))
.setIcon(android.R.drawable.ic_dialog_alert)
.setMessage(e.getMessage())
.setCancelable(false)
.setNegativeButton("Ok", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
finish();
}
});
AlertDialog alert = builder.create();
alert.show();
} catch (Exception e) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.app_name))
.setIcon(android.R.drawable.ic_dialog_alert)
.setMessage(R.string.server_down)
.setCancelable(false)
.setNegativeButton("Ok", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
finish();
}
});
AlertDialog alert = builder.create();
alert.show();
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.score);
this.networkStuff();
this.networkStuff();
// TODO : Attention, le cast en (BaseGame) n'est pas sûr !
DownloadedBaseGame bg = (DownloadedBaseGame)gamePlayed.getGame();
((TextView)findViewById(R.id.total)).setText(String.valueOf(sr.getScoreTotal()));
((TextView)findViewById(R.id.scoreRel1)).setText(bg.getCatString(1));
((TextView)findViewById(R.id.scoreRel2)).setText(bg.getCatString(2));
((TextView)findViewById(R.id.scoreRel3)).setText(bg.getCatString(3));
((TextView)findViewById(R.id.scoreRel4)).setText(bg.getCatString(4));
String res;
String noAnswers = getString(string.score_no_answers);
res = "";
for (int i : gamePlayed.getRelation1()) {
res += bg.getWordInCloud(i).getName();
res += " (" + String.valueOf(sr.getScoreOfWord(i)) + "), ";
}
((TextView)findViewById(R.id.scoreWords1)).setText(res.length() < 1 ? noAnswers : res);
res = "";
for (int i : gamePlayed.getRelation2()) {
res += bg.getWordInCloud(i).getName();
res += " (" + String.valueOf(sr.getScoreOfWord(i)) + "), ";
}
((TextView)findViewById(R.id.scoreWords2)).setText(res.length() < 1 ? noAnswers : res);
res = "";
for (int i : gamePlayed.getRelation3()) {
res += bg.getWordInCloud(i).getName();
res += " (" + String.valueOf(sr.getScoreOfWord(i)) + "), ";
}
((TextView)findViewById(R.id.scoreWords3)).setText(res.length() < 1 ? noAnswers : res);
res = "";
for (int i : gamePlayed.getRelation4()) {
res += bg.getWordInCloud(i).getName();
res += " (" + String.valueOf(sr.getScoreOfWord(i)) + "), ";
}
((TextView)findViewById(R.id.scoreWords4)).setText(res.length() < 1 ? noAnswers : res);
((Button)findViewById(R.id.saw)).setOnClickListener(this);
}
@Override
public void onBackPressed() {
super.onBackPressed();
finish();
}
protected double calculateTotal(){
throw new UnsupportedOperationException();
}
@Override
public void onClick(View v) {
if (v.getId()==R.id.saw) {
finish();
}
}
}

100
code/PtiClic/src/org/pticlic/FrontPage.java
View File

@ -1,25 +1,15 @@
package org.pticlic;
import org.pticlic.games.BaseGame;
import org.pticlic.model.Constant;
import org.pticlic.model.Network;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.TextView;
import android.webkit.WebSettings;
import android.webkit.WebView;
public class FrontPage extends Activity implements OnClickListener{
public class FrontPage extends Activity {
private Uri uri = null;
private WebView webView;
/** Called when the activity is first created. */
@Override
@ -27,83 +17,11 @@ public class FrontPage extends Activity implements OnClickListener{
super.onCreate(savedInstanceState);
setContentView(R.layout.frontpage);
// Écoute des clics sur les différents boutons
((ImageView)findViewById(R.id.prefs)).setOnClickListener(this);
((ImageView)findViewById(R.id.play)).setOnClickListener(this);
((ImageView)findViewById(R.id.infoButton)).setOnClickListener(this);
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
String serverURL = sp.getString(Constant.SERVER_URL, Constant.SERVER);
Uri.parse(serverURL + "/signup.php");
}
@Override
protected void onStart() {
super.onStart();
// On récupère le nom du joueur des préférences.
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
Boolean connected = sp.getBoolean(Constant.SERVER_AUTH, false);
if (connected) {
((TextView)findViewById(R.id.login)).setText(R.string.frontpage_user_connected);
} else {
((TextView)findViewById(R.id.login)).setText(R.string.frontpage_user_notconnected);
}
}
/* (non-Javadoc)
* @see android.view.View.OnClickListener#onClick(android.view.View)
*/
@Override
public void onClick(View v) {
switch (v.getId()) {
case (R.id.prefs) : startActivity(new Intent(this, Preference.class)); break;
case (R.id.play) : checkAllIsOk(BaseGame.class); break;
case (R.id.infoButton) : startActivity(new Intent(this, Information.class)); break;
}
}
@SuppressWarnings("rawtypes")
private void checkAllIsOk(Class c) {
if (Network.isConnected(this)) {
if (Network.isLoginCorrect(this)) {
startActivity(new Intent(this, c));
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.app_name))
.setIcon(android.R.drawable.ic_dialog_alert)
.setMessage(getString(R.string.frontpage_bad_loginmdp))
.setCancelable(false)
.setNeutralButton(getString(R.string.frontpage_inscription_button), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
// TODO : Essayer de trouver comment mettre l'url qui est dans les preferences.
startActivity(new Intent(Intent.ACTION_VIEW, uri));
}
})
.setPositiveButton(getString(R.string.frontpage_preference_button), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.dismiss();
startActivity(new Intent(getApplicationContext(), Preference.class));
}
});
AlertDialog alert = builder.create();
alert.show();
}
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.app_name))
.setIcon(android.R.drawable.ic_dialog_alert)
.setMessage(getString(R.string.frontpage_no_connection))
.setCancelable(false)
.setNegativeButton("Ok", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
AlertDialog alert = builder.create();
alert.show();
}
webView = (WebView) findViewById(R.id.webview);
WebSettings webSettings = webView.getSettings();
webSettings.setJavaScriptEnabled(true);
webView.loadUrl(Constant.SERVER + Constant.SERVER_URL);
}
@Override

7
code/PtiClic/src/org/pticlic/Information.java
View File

@ -8,6 +8,7 @@ import java.io.InputStreamReader;
import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.TextView;
@ -21,8 +22,10 @@ public class Information extends Activity {
((TextView)findViewById(R.id.infoVersion)).setText("version : " + getString(R.string.version));
InputStream in = getResources().openRawResource(R.raw.info);
WebView webview = (WebView)findViewById(R.id.textContent);
webview.setBackgroundColor(Color.BLACK);
webview.setBackgroundColor(Color.WHITE);
webview.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);
WebSettings webSettings = webview.getSettings();
webSettings.setJavaScriptEnabled(true);
if (in != null) {
@ -37,7 +40,7 @@ public class Information extends Activity {
}
in.close();
webview.loadData(buf.toString(), "text/html", "UTF-8");
webview.loadData(html, "text/html", "UTF-8");
} catch (IOException e) {
//TODO : Ajouter un boite de dialog indiquant qu'une erreur est arrivee.

433
code/PtiClic/src/org/pticlic/games/BaseGame.java
View File

@ -1,433 +0,0 @@
package org.pticlic.games;
import org.pticlic.R;
import org.pticlic.BaseScore;
import org.pticlic.exception.PtiClicException;
import org.pticlic.model.Constant;
import org.pticlic.model.DownloadedBaseGame;
import org.pticlic.model.Match;
import org.pticlic.model.Network;
import org.pticlic.model.Network.Mode;
import org.pticlic.model.Relation;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.Display;
import android.view.Gravity;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.animation.AlphaAnimation;
import android.view.animation.AnimationSet;
import android.view.animation.TranslateAnimation;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.TextView;
import com.google.gson.Gson;
/**
* @author Bertrand BRUN et Georges DUPÉRON
*
* Cette classe est le controlleur du premier jeu.
*
* Ce premier jeu appeler "Jeux de Base", permet de creer des relations en selectionnant
* le type de relation d'un mot du nuage de mot par rapport au mot central.
*
* La vue de ce jeu se presente sous la forme d'un fenetre presentant en haut le mot central,
* et les mots du nuage descende en partant du mot central vers le centre du mobile.
* Une fois le mot du nuage afficher, l'utilisateur peut selectionner, parmis les relations
* proposer celle qui lui semble le mieux approprier.
*
*/
public class BaseGame extends Activity implements OnClickListener {
private int currentWord = 0;
private TextView currentWordTextView;
private TextView wordRemaining;
private int nbWord = 0;
private DownloadedBaseGame game;
private Match match;
private Network network;
private boolean help = false;
private String gameJson;
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.basegame);
// On recupere du PreferenceManager les differentes information dont on a besoin
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
String serverURL = sp.getString(Constant.SERVER_URL, Constant.SERVER);
String id = sp.getString(Constant.USER_ID, "joueur");
String passwd = sp.getString(Constant.USER_PASSWD, "");
gameJson = sp.getString(Constant.NEW_BASE_GAME, null);
// On initialise la classe permettant la communication avec le serveur.
network = new Network(serverURL, Mode.SIMPLE_GAME, id, passwd);
}
/* (non-Javadoc)
* @see android.app.Activity#onStart()
*/
@Override
protected void onStart() {
super.onStart();
try {
Gson gson = new Gson();
if (gameJson == null) game = (DownloadedBaseGame)network.getGames(1);
else game = gson.fromJson(gameJson, DownloadedBaseGame.class);
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
Boolean first = sp.getBoolean(Constant.FIRST_TIME, true);
if (first) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.basegame_title))
.setIcon(android.R.drawable.ic_dialog_info)
.setMessage(getString(R.string.basegame_explication))
.setCancelable(false)
.setNegativeButton("Fermez", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
runMatch();
start();
}
})
.setPositiveButton("Ne plus afficher", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
sp.edit().putBoolean(Constant.FIRST_TIME, false).commit();
dialog.cancel();
runMatch();
start();
}
});
AlertDialog alert = builder.create();
alert.show();
} else {
runMatch();
start();
}
} catch (PtiClicException e) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.app_name))
.setIcon(android.R.drawable.ic_dialog_alert)
.setMessage(e.getMessage())
.setCancelable(false)
.setNegativeButton("Ok", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
finish();
}
});
AlertDialog alert = builder.create();
alert.show();
} catch (Exception e) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.app_name))
.setIcon(android.R.drawable.ic_dialog_alert)
.setMessage(getString(R.string.server_down))
.setCancelable(false)
.setNegativeButton("Ok", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
finish();
}
});
AlertDialog alert = builder.create();
alert.show();
}
}
private void runMatch() {
nbWord = game.getNbWord();
wordRemaining = (TextView)findViewById(R.id.wordRemaining);
wordRemaining.setText((currentWord + 1) + "/" + nbWord);
// On initialise la partie.
match = new Match();
match.setGame(game);
// Boutons des relations
ImageView r1 = ((ImageView)findViewById(R.id.relation1));
ImageView r2 = ((ImageView)findViewById(R.id.relation2));
ImageView r3 = ((ImageView)findViewById(R.id.relation3));
ImageView r4 = ((ImageView)findViewById(R.id.relation4));
// TextView des relations
TextView rn1 = ((TextView)findViewById(R.id.relation1Name));
TextView rn2 = ((TextView)findViewById(R.id.relation2Name));
TextView rn3 = ((TextView)findViewById(R.id.relation3Name));
TextView rn4 = ((TextView)findViewById(R.id.relation4Name));
// Bouton d'aide
ImageView aide = ((ImageView)findViewById(R.id.aideBaseGame));
aide.setOnClickListener(this);
// On met set le nom du mot central
((TextView)findViewById(R.id.mainWord)).setText(DownloadedBaseGame.getName(game.getCentre()));
Relation r = Relation.getInstance();
// Écoute des clics sur les relations
// TODO : A enlever lorsque l'on aura toutes les images des relations.
try {
r1.setOnClickListener(this);
rn1.setText(String.format(r.getRelationName(game.getCat1()), ((TextView)findViewById(R.id.mainWord)).getText()));
r1.setImageResource(r.getRelationImage(game.getCat1()));
} catch (Exception e) {
r1.setImageResource(R.drawable.icon);
}
// TODO : A enlever lorsque l'on aura toutes les images des relations.
try {
r2.setOnClickListener(this);
rn2.setText(String.format(r.getRelationName(game.getCat2()), ((TextView)findViewById(R.id.mainWord)).getText()));
r2.setImageResource(r.getRelationImage(game.getCat2()));
} catch (Exception e) {
r2.setImageResource(R.drawable.icon);
}
// TODO : A enlever lorsque l'on aura toutes les images des relations.
try {
r3.setOnClickListener(this);
rn3.setText(String.format(r.getRelationName(game.getCat3()), ((TextView)findViewById(R.id.mainWord)).getText()));
r3.setImageResource(r.getRelationImage(game.getCat3()));
} catch (Exception e) {
r3.setImageResource(R.drawable.icon);
}
// TODO : A enlever lorsque l'on aura toutes les images des relations.
try {
r4.setOnClickListener(this);
rn4.setText(String.format(r.getRelationName(game.getCat4()), ((TextView)findViewById(R.id.mainWord)).getText()));
r4.setImageResource(r.getRelationImage(game.getCat4()));
} catch (Exception e) {
r4.setImageResource(R.drawable.icon);
}
this.helpMode();
}
/* (non-Javadoc)
* @see android.app.Activity#onActivityResult(int, int, android.content.Intent)
*/
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
finish();
}
/**
* Cette methode permet au mot courant de partir du mot central vers le centre de l'appareil.
*/
private void arrivalView() {
//On recupere la largueur de l'ecran.
Display display = getWindowManager().getDefaultDisplay();
int width = display.getWidth();
// On recupere le centre de mainWord pour l'animation de translation.
TextView mainWord = (TextView)findViewById(R.id.mainWord);
currentWordTextView = (TextView)findViewById(R.id.currentWord);
// On defini un ensemble d'animation
AnimationSet set = new AnimationSet(true);
set.setDuration(1000);
set.setFillAfter(true);
TranslateAnimation translate;
if (isInHelpMode())
translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 8);
else
translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 4);
translate.setDuration(500);
set.addAnimation(translate);
AlphaAnimation alpha = new AlphaAnimation(0, 1);
alpha.setDuration(1000);
set.addAnimation(alpha);
// Que l'on rajoute a notre vue.
currentWordTextView.startAnimation(set);
}
/**
*
*/
private void leaveView() {
currentWordTextView.clearAnimation();
}
/**
* Cette methode permet de passer au mot courant suivant et de lancer l'animation.
*/
private void start() {
((TextView)findViewById(R.id.currentWord)).setText(DownloadedBaseGame.getName(game.getWordInCloud(currentWord)));
arrivalView();
}
/**
* Permet de verifier si la partie est fini auquel cas on lance l'activite Score, sinon on passe au mot suivant.
*/
private void next() {
if (++currentWord < nbWord) {
wordRemaining.setText((currentWord + 1) + "/" + nbWord);
leaveView();
start();
} else {
Intent intent = new Intent(this, BaseScore.class);
intent.putExtra(Constant.SCORE_GAMEPLAYED, match);
intent.putExtra(Constant.SCORE_MODE, Mode.SIMPLE_GAME);
startActivityForResult(intent, 0x100);
}
}
/**
* Cette methode est appeler lorsque l'utilisateur appuie sur le bouton d'aide.
* Elle change la disposition des elements de maniere a afficher la description
* de l'icone a cote de l'icone.
*/
private void helpMode() {
if (!isInHelpMode()) {
help = true;
LayoutParams layoutParams = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 2);
// On modifie l'affichage du layout
LinearLayout menuLayout = ((LinearLayout)findViewById(R.id.menuLayout));
menuLayout.setOrientation(LinearLayout.VERTICAL);
menuLayout.setLayoutParams(layoutParams);
// Puis on modifie l'affichage des relations
//relation1
LinearLayout relationLayout = ((LinearLayout)findViewById(R.id.relation1Layout));
relationLayout.setGravity(Gravity.LEFT);
TextView relationName = ((TextView)findViewById(R.id.relation1Name));
relationName.setVisibility(View.VISIBLE);
//relation2
relationLayout = ((LinearLayout)findViewById(R.id.relation2Layout));
relationLayout.setGravity(Gravity.LEFT);
relationName = ((TextView)findViewById(R.id.relation2Name));
relationName.setVisibility(View.VISIBLE);
//relation3
relationLayout = ((LinearLayout)findViewById(R.id.relation3Layout));
relationLayout.setGravity(Gravity.LEFT);
relationName = ((TextView)findViewById(R.id.relation3Name));
relationName.setVisibility(View.VISIBLE);
//relation4
relationLayout = ((LinearLayout)findViewById(R.id.relation4Layout));
relationLayout.setGravity(Gravity.LEFT);
relationName = ((TextView)findViewById(R.id.relation4Name));
relationName.setVisibility(View.VISIBLE);
// On met le mot courant au bon endroit dans la fenetre
// On recupere la largueur de l'ecran.
Display display = getWindowManager().getDefaultDisplay();
int width = display.getWidth();
//On recupere le centre de mainWord pour l'animation de translation.
TextView mainWord = (TextView)findViewById(R.id.mainWord);
currentWordTextView = (TextView)findViewById(R.id.currentWord);
TranslateAnimation translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 8);
translate.setDuration(0);
translate.setFillAfter(true);
currentWordTextView.setAnimation(translate);
} else {
help = false;
LayoutParams layoutParams = new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 10);
// On modifie l'affichage du layout
LinearLayout menuLayout = ((LinearLayout)findViewById(R.id.menuLayout));
menuLayout.setOrientation(LinearLayout.HORIZONTAL);
menuLayout.setLayoutParams(layoutParams);
// Puis on modifie l'affichage des relations
//relation1
LinearLayout relationLayout = ((LinearLayout)findViewById(R.id.relation1Layout));
relationLayout.setGravity(Gravity.CENTER);
TextView relationName = ((TextView)findViewById(R.id.relation1Name));
relationName.setVisibility(View.GONE);
//relation2
relationLayout = ((LinearLayout)findViewById(R.id.relation2Layout));
relationLayout.setGravity(Gravity.CENTER);
relationName = ((TextView)findViewById(R.id.relation2Name));
relationName.setVisibility(View.GONE);
//relation3
relationLayout = ((LinearLayout)findViewById(R.id.relation3Layout));
relationLayout.setGravity(Gravity.CENTER);
relationName = ((TextView)findViewById(R.id.relation3Name));
relationName.setVisibility(View.GONE);
//relation4
relationLayout = ((LinearLayout)findViewById(R.id.relation4Layout));
relationLayout.setGravity(Gravity.CENTER);
relationName = ((TextView)findViewById(R.id.relation4Name));
relationName.setVisibility(View.GONE);
// On met le mot courant au bon endroit dans la fenetre
// On recupere la largueur de l'ecran.
Display display = getWindowManager().getDefaultDisplay();
int width = display.getWidth();
//On recupere le centre de mainWord pour l'animation de translation.
TextView mainWord = (TextView)findViewById(R.id.mainWord);
currentWordTextView = (TextView)findViewById(R.id.currentWord);
TranslateAnimation translate = new TranslateAnimation(mainWord.getScrollX() / 2, mainWord.getScrollX() / 2, mainWord.getScrollY() / 2, width / 4);
translate.setDuration(0);
translate.setFillAfter(true);
currentWordTextView.setAnimation(translate);
}
}
/**
* Permet de savoir si l'on se trouve ou non dans le mode d'aide
*
* @return <code>true</code> si l'on ce trouve dans le mode d'aide <code>false</code> sinon
*/
private boolean isInHelpMode() {
return help;
}
/* (non-Javadoc)
* @see android.view.View.OnClickListener#onClick(android.view.View)
*/
@Override
public void onClick(View v) {
switch (v.getId()) {
case (R.id.relation1) : match.add(1, currentWord); next(); break;
case (R.id.relation2) : match.add(2, currentWord); next(); break;
case (R.id.relation3) : match.add(3, currentWord); next(); break;
case (R.id.relation4) : match.add(4, currentWord); next(); break;
case (R.id.aideBaseGame) : helpMode(); break;
}
}
}

2
code/PtiClic/src/org/pticlic/model/Constant.java
View File

@ -1,7 +1,7 @@
package org.pticlic.model;
public class Constant {
public static final String SERVER_URL = "server";
public static final String SERVER_URL = "html5/code/html5/";
public static final String SERVER_AUTH = "SERVER_AUTH";
public static final String SERVER = "http://www.pticlic.fr/";

144
code/PtiClic/src/org/pticlic/model/DownloadedBaseGame.java
View File

@ -1,144 +0,0 @@
package org.pticlic.model;
import java.io.Serializable;
import java.util.Arrays;
/**
* @author Bertrand BRUN
*
* Classe metier reprensentant une parti "Normal" telecharge.
*/
public class DownloadedBaseGame extends DownloadedGame {
private static final long serialVersionUID = 1L;
public static class Word implements Serializable {
private static final long serialVersionUID = 1L;
private int id;
private String name;
public Word() {}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
private int cat1;
private int cat2;
private int cat3;
private int cat4;
private Word center;
private Word[] cloud;
public DownloadedBaseGame() {
super();
this.cat1 = -1;
this.cat2 = -1;
this.cat3 = -1;
this.cat4 = -1;
this.center = null;
this.cloud = null;
}
public DownloadedBaseGame(int id, int gid, int pgid, int cat1, int cat2,
int cat3, int cat4, Word center, Word[] cloud) {
super(id, gid, pgid);
this.cat1 = cat1;
this.cat2 = cat2;
this.cat3 = cat3;
this.cat4 = cat4;
this.center = center;
this.cloud = cloud;
}
public static String getName(Word word) {
return word.getName();
}
public int getCat(int numCat) {
switch (numCat) {
case 1: return getCat1();
case 2: return getCat2();
case 3: return getCat3();
default: return getCat4();
}
}
public String getCatString(int numCat) {
return String.format(
Relation.getInstance().getRelationName(this.getCat(numCat)),
center.getName());
}
public int getCat1() {
return cat1;
}
public void setCat1(int cat1) {
this.cat1 = cat1;
}
public int getCat2() {
return cat2;
}
public void setCat2(int cat2) {
this.cat2 = cat2;
}
public int getCat3() {
return cat3;
}
public void setCat3(int cat3) {
this.cat3 = cat3;
}
public int getCat4() {
return cat4;
}
public void setCat4(int cat4) {
this.cat4 = cat4;
}
public Word getCentre() {
return center;
}
public void setCentre(Word center) {
this.center = center;
}
public int getNbWord() {
return cloud.length;
}
public Word getWordInCloud(int index) {
return cloud[index];
}
@Override
public String toString() {
return "DownloadedBaseGame [gid=" + gid + ", pgid=" + pgid + ", id=" + id
+ ", cat1=" + cat1 + ", cat2=" + cat2 + ", cat3=" + cat3
+ ", cat4=" + cat4 + ", center=" + center + ", cloud="
+ Arrays.toString(cloud) + "]";
}
}

57
code/PtiClic/src/org/pticlic/model/DownloadedGame.java
View File

@ -1,57 +0,0 @@
package org.pticlic.model;
import java.io.Serializable;
/**
* @author Bertrand BRUN
*
* Classe metier reprensentant n'importe quel le jeu telecharger du serveur.
*
*/
public abstract class DownloadedGame implements Serializable {
private static final long serialVersionUID = 1L;
protected int gid;
protected int pgid;
protected int id;
public DownloadedGame() {
this.id = -1;
this.gid = -1;
this.pgid = -1;
}
public DownloadedGame(int id, int gid, int pgid) {
super();
this.id = id;
this.gid = gid;
this.pgid = pgid;
}
public int getGid() {
return gid;
}
public void setGid(int gid) {
this.gid = gid;
}
public int getPgid() {
return pgid;
}
public void setPgid(int pgid) {
this.pgid = pgid;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
}

74
code/PtiClic/src/org/pticlic/model/Match.java
View File

@ -1,74 +0,0 @@
package org.pticlic.model;
import java.io.Serializable;
import java.util.ArrayList;
/**
* @author Bertrand BRUN
*
* Cette classe represente une partie joue.
* Elle sera envoyer au serveur pour que celui-ci
* puisse calculer le score obtenue.
*
*/
public class Match implements Serializable {
private static final long serialVersionUID = 1L;
private ArrayList<Integer> relation1;
private ArrayList<Integer> relation2;
private ArrayList<Integer> relation3;
private ArrayList<Integer> relation4;
private DownloadedGame game;
public Match() {
relation1 = new ArrayList<Integer>();
relation2 = new ArrayList<Integer>();
relation3 = new ArrayList<Integer>();
relation4 = new ArrayList<Integer>();
}
public void setGame(DownloadedGame game) {
this.game = game;
}
public DownloadedGame getGame() {
return game;
}
public void add(int relation, int word) {
switch (relation) {
case 1: relation1.add(word); break;
case 2: relation2.add(word); break;
case 3: relation3.add(word); break;
case 4: relation4.add(word); break;
}
}
/**
* @return the relation1
*/
public ArrayList<Integer> getRelation1() {
return relation1;
}
/**
* @return the relation2
*/
public ArrayList<Integer> getRelation2() {
return relation2;
}
/**
* @return the relation3
*/
public ArrayList<Integer> getRelation3() {
return relation3;
}
/**
* @return the relation4
*/
public ArrayList<Integer> getRelation4() {
return relation4;
}
}

183
code/PtiClic/src/org/pticlic/model/Network.java
View File

@ -1,13 +1,6 @@
package org.pticlic.model;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import org.pticlic.exception.PtiClicException;
import android.content.Context;
import android.content.SharedPreferences;
@ -15,7 +8,6 @@ import android.net.ConnectivityManager;
import android.preference.PreferenceManager;
import com.google.gson.Gson;
import com.google.gson.stream.JsonReader;
/**
@ -175,179 +167,4 @@ public class Network {
return res;
}
/**
* Cette méthode permet de récupérer du serveur un certain nombre de parties.
* @param nbGames Le nombre de parties que l'on veut récupérer.
* @return
*/
public DownloadedGame getGames(int nbGames) throws PtiClicException, Exception {
switch (mode) {
case SIMPLE_GAME:
return DownloadBaseGame(nbGames);
default:
return null;
}
}
private DownloadedBaseGame DownloadBaseGame(int nbGames) throws PtiClicException, Exception {
Gson gson = null;
String json = null;
DownloadedBaseGame game = null;
// URLConnection connection = url.openConnection();
// connection.addRequestProperty("action", Action.GET_GAMES.value());
// connection.addRequestProperty("user", this.id);
// connection.addRequestProperty("passwd", this.passwd);
// connection.addRequestProperty("nb", String.valueOf(nbGames));
// connection.addRequestProperty("mode", mode.value());
String urlS = this.serverURL
+ "?action=" + Action.GET_GAMES.value()
+ "&user=" + this.id
+ "&passwd=" + this.passwd
+ "&nb=" + String.valueOf(nbGames)
+ "&mode="+mode.value();
gson = new Gson();
json = HttpClient.SendHttpPost(urlS);
try {
//JsonReader reader = new JsonReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
InputStream in = new ByteArrayInputStream(json.getBytes("UTF-8"));
JsonReader jsonReader = new JsonReader(new InputStreamReader(in));
// FIXME : Attention lorsque l'on pourra vraiment recupere plusieur partie, il faudra changer ce qui suit.
jsonReader.beginArray();
while (jsonReader.hasNext()) {
game = makeBaseGame(jsonReader, gson);
}
jsonReader.endArray();
jsonReader.close();
} catch (UnsupportedEncodingException e1) {
throw new PtiClicException(0, "Impossible de recuperer l'erreur, nous avons pris note de cette erreur.\n Merci");
} catch (IOException e1) {
throw new PtiClicException(0, "Impossible de recuperer l'erreur, nous avons pris note de cette erreur.\n Merci");
} catch (Exception e) {
throw new PtiClicException(json);
}
return game;
}
/**
* Permet la transformation du Json en une instance de Game.
*
* @param reader Le Json sous forme d'un flux.
* @param gson Une instance de Gson.
* @return Une nouvelle instance de Game.
* @throws IOException
*/
private DownloadedBaseGame makeBaseGame(JsonReader reader, Gson gson) throws IOException {
int gid = -1;
int pgid = -1;
int id = -1;
int cat1 = -1;
int cat2 = -1;
int cat3 = -1;
int cat4 = -1;
DownloadedBaseGame.Word center = null;
DownloadedBaseGame.Word[] cloud = null;
reader.beginObject();
while (reader.hasNext()) {
String name = reader.nextName();
if (name.equals("id")) {
id = reader.nextInt();
} else if (name.equals("gid")) {
gid = reader.nextInt();
} else if (name.equals("pgid")) {
pgid = reader.nextInt();
} else if (name.equals("cat1")) {
cat1 = reader.nextInt();
} else if (name.equals("cat2")) {
cat2 = reader.nextInt();
} else if (name.equals("cat3")) {
cat3 = reader.nextInt();
} else if (name.equals("cat4")) {
cat4 = reader.nextInt();
} else if (name.equals("center")) {
center = gson.fromJson(reader, DownloadedBaseGame.Word.class);
} else if (name.equals("cloud")) {
cloud = gson.fromJson(reader, DownloadedBaseGame.Word[].class);
} else {
reader.skipValue();
}
}
reader.endObject();
return new DownloadedBaseGame(id, gid, pgid, cat1, cat2, cat3, cat4, center, cloud);
}
/**
* Cette méthode permet d'envoyer les parties au serveur pour qu'il puisse les
* rajouter à la base de données, et calculer le score.
* @param game La partie jouee par l'utilisateur
* @return Le score sous forme JSON.
*/
public ScoreResponse sendGame(Match game) throws PtiClicException, Exception {
switch (mode) {
case SIMPLE_GAME:
return sendBaseGame(game);
default:
return null;
}
}
public ScoreResponse sendBaseGame(Match game) throws PtiClicException, Exception {
Gson gson = null;
String json = null;
// TODO : ne restera le temps que les requete du serveur passe du GET au POST
String urlS = this.serverURL
+ "?action=" + Action.SEND_GAME.value()
+ "&user=" + this.id
+ "&passwd=" + this.passwd
+ "&pgid=" + game.getGame().getPgid()
+ "&gid=" + game.getGame().getGid()
+ "&mode="+mode.value()
+ "&nb="+((DownloadedBaseGame)(game.getGame())).getNbWord();
// TODO : faut gere le mode
for (Integer i : game.getRelation1()) {
urlS += "&" + i + "=" + ((DownloadedBaseGame)game.getGame()).getCat1() ;
}
for (Integer i : game.getRelation2()) {
urlS += "&" + i + "=" + ((DownloadedBaseGame)game.getGame()).getCat2();
}
for (Integer i : game.getRelation3()) {
urlS += "&" + i + "=" + ((DownloadedBaseGame)game.getGame()).getCat3();
}
for (Integer i : game.getRelation4()) {
urlS += "&" + i + "=" + ((DownloadedBaseGame)game.getGame()).getCat4();
}
// URL url = new URL(this.serverURL); // Attention ! this.serverURL contient "/server.php"
// URLConnection connection = url.openConnection();
// connection.addRequestProperty("action", Action.SEND_GAME.value());
// connection.addRequestProperty("user", this.id);
// connection.addRequestProperty("passwd", this.passwd);
// connection.addRequestProperty("mode", mode.value());
// connection.addRequestProperty("pgid", String.valueOf(game.getGame().getId()));
gson = new Gson();
json = HttpClient.SendHttpPost(urlS);
// Comme gson ne renvoie pas une erreur si l'objet qui recupere ne correspond pas a la classe qu'il attends.
// On creer tout d'abord une objet error et si celui-ci est vide on creer l'objet score, sinon on lance
// une exception.
int foo = 42;
ScoreResponse sr = gson.fromJson(json, ScoreResponse.class);
foo = foo + 1;
if (sr.getNewGame() == null) {
throw new PtiClicException(gson.fromJson(json, PtiClicException.Error.class));
} else {
return sr;
}
}
}

88
code/PtiClic/src/org/pticlic/model/Relation.java
View File

@ -1,88 +0,0 @@
package org.pticlic.model;
import java.util.HashMap;
import org.pticlic.R;
/**
* @author Bertrand BRUN
*
* Cette classe permet de recuperer le noms ou l'image d'un relation en fonction du numero de son id.
*
*/
public class Relation {
// TODO : Penser a peut etre remplacer les HashMap par une BDD.
private static Relation instance = null;
HashMap<Integer, String> stringRelations;
HashMap<Integer, Integer> imageRelations;
private Relation() {
imageRelations = new HashMap<Integer, Integer>();
imageRelations.put(-1, R.drawable.corbeille);
imageRelations.put(0, R.drawable.rapport);
imageRelations.put(5, R.drawable.synonyme);
imageRelations.put(7, R.drawable.contraire);
imageRelations.put(9, R.drawable.contenu);
imageRelations.put(10, R.drawable.contenant);
// ATTENTION ! Tout ce qui est ci-dessous est en double dans relations.php .
stringRelations = new HashMap<Integer, String>();
stringRelations.put(-1, "Mot non lié à '%s'");
stringRelations.put(0, "'%s' est en rapport avec...");
stringRelations.put(1, "raffinement sémantique"); // pas utilisé
stringRelations.put(2, "raffinement morphologique"); // pas utilisé
stringRelations.put(3, "domaine"); // pas utilisé
stringRelations.put(4, "r_pos"); // pas utilisé
stringRelations.put(5, "'%s' est un synonyme de...");
stringRelations.put(6, "'%s' est une sorte de...");
stringRelations.put(7, "Un contraire de '%s' est...");
stringRelations.put(8, "Un spécifique de '%s' est...");
stringRelations.put(9, "... est une partie de '%s'");
stringRelations.put(10, "'%s' fait partie de...");
stringRelations.put(11, "locution"); // pas utilisé
stringRelations.put(12, "potentiel de FL"); // pas utilisé
stringRelations.put(13, "Quoi/Qui pourrait '%s'");
stringRelations.put(14, "action>patient"); // pas utilisé
stringRelations.put(15, "Le lieu pour '%s' est...");
stringRelations.put(16, "Un instrument pour '%s' est...");
stringRelations.put(17, "Un caractéristique de '%s' est...");
stringRelations.put(18, "r_data"); // pas utilisé
stringRelations.put(19, "r_lemma"); // pas utilisé
stringRelations.put(20, "magn"); // pas utilisé
stringRelations.put(21, "antimagn"); // pas utilisé
stringRelations.put(22, "'%s' est de la même famille que...");
stringRelations.put(29, "predicat"); // pas utilisé
stringRelations.put(30, "lieu>action"); // pas utilisé
stringRelations.put(31, "action>lieu"); // pas utilisé
stringRelations.put(32, "sentiment"); // pas utilisé
stringRelations.put(33, "erreur"); // pas utilisé
stringRelations.put(34, "manière"); // pas utilisé
stringRelations.put(35, "sens/signification"); // pas utilisé
stringRelations.put(36, "information potentielle"); // pas utilisé
stringRelations.put(37, "rôle télique"); // pas utilisé
stringRelations.put(38, "rôle agentif"); // pas utilisé
stringRelations.put(41, "conséquence"); // pas utilisé
stringRelations.put(42, "cause"); // pas utilisé
stringRelations.put(52, "succession"); // pas utilisé
stringRelations.put(53, "produit"); // pas utilisé
stringRelations.put(54, "est le produit de"); // pas utilisé
stringRelations.put(55, "s'oppose à"); // pas utilisé
}
public synchronized static Relation getInstance() {
if (instance == null) {
instance = new Relation();
}
return instance;
}
public String getRelationName(int id) {
return stringRelations.get(id);
}
public Integer getRelationImage(int id) {
return imageRelations.get(id);
}
}

BIN
code/html5/img/aide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
code/html5/img/config.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
code/html5/img/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
code/html5/img/mode_chrono.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
code/html5/img/mode_marathon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
code/html5/img/mode_normal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
code/html5/img/mode_ombre.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
code/html5/img/rel/-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

BIN
code/html5/img/rel/0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
code/html5/img/rel/10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
code/html5/img/rel/5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
code/html5/img/rel/7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
code/html5/img/rel/9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
code/html5/img/rel/default.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
code/html5/img/splash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 96 KiB

62
code/html5/index.html Normal file
View File

@ -0,0 +1,62 @@
<!DOCTYPE html>
<html>
<head>
<title>PtiClic pre-alpha 0.2</title>
<meta charset="utf-8" />
<style>
body {
background-color: black;
}
#screen {
background-color : #FFFFE0;
}
#mc-caption {
color: #8b4;
}
#mn-caption {
color: #4a4;
}
#mn-caption-block {
border-top: medium solid #44AA44;
border-bottom: medium solid #44AA44;
background-color: #F0F8D0;
}
.relationBox {
background-color: #F0F8D0;
border: thin solid #44AA44;
}
.relations .hot {
background-color: yellow;
}
.clearboth {
clear: both;
}
</style>
<script src="jquery-1.5.1.min.js"></script>
<script src="jquery-ui-1.8.11.custom.min.js"></script>
<script src="pticlic.js"></script>
<script src="my-extensions.js"></script>
</head>
<body>
<div id="screen">
<div id="mc-caption-block"></div>
<div id="mn-caption-block"></div>
<div id="mc-caption" class="mc"></div>
<div id="mn-caption" class="mn"></div>
<div class="relations"></div>
<div id="templates" style="display: none;">
<div class="relationBox">
<div class="relation"><img class="icon" alt="" src="img/rel/default.png" /><span class="text"></span></div>
<div class="clearboth"></div>
</div>
</div>
</div>
</body>
</html>

16
code/html5/jquery-1.5.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

62
code/html5/jquery-ui-1.8.11.custom.min.js vendored Normal file
View File

@ -0,0 +1,62 @@
/*!
* jQuery UI 1.8.11
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
* http://docs.jquery.com/UI
*/
(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.11",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,
d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&
b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
;/*
* jQuery UI Effects 1.8.11
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/
*/
jQuery.effects||function(f,j){function n(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return o.transparent;return o[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return n(b)}function p(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function q(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function m(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=n(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var o={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},r=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
d){if(f.isFunction(b)){d=b;b=null}return this.queue("fx",function(){var e=f(this),g=e.attr("style")||" ",h=q(p.call(this)),l,v=e.attr("className");f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});l=q(p.call(this));e.attr("className",v);e.animate(u(h,l),a,b,function(){f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments)});h=f.queue(this);l=h.splice(h.length-1,1)[0];
h.splice(1,0,l);f.dequeue(this)})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,
a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.11",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,
a){var b;switch(c[0]){case "top":b=0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",
border:"none",margin:0,padding:0});c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);
return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(m(c))return this._show.apply(this,arguments);
else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(m(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(m(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),
b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,
a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,
a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==
e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=
g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/
h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,
a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
;/*
* jQuery UI Effects Highlight 1.8.11
*
* Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
* http://docs.jquery.com/UI/Effects/Highlight
*
* Depends:
* jquery.effects.core.js
*/
(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
;

113
code/html5/my-extensions.js Normal file
View File

@ -0,0 +1,113 @@
Number.prototype.clip = function(min, max, floor) {
return Math.min(Math.max(floor ? Math.floor(this) : this, min), max);
};
function dichotomy(start, isBigger) {
var i = 0, min = 0, max, half;
for (max = start || 1; ++i < 10 && !isBigger(max); max *= 2);
for (half = start; Math.abs(min-max) > 0.1; half = (min + max) / 2) {
if (!isBigger(half)) min = half;
else max = half;
}
while (half > 1 && isBigger(half)) { --half; }
return half;
}
$.fn.maxWidth = function() {
max = 0;
this.each(function(i,e){ max = Math.max(max, $(e).width()); });
return max;
}
$.fn.maxHeight = function() {
max = 0;
this.each(function(i,e){ max = Math.max(max, $(e).height()); });
return max;
}
$.fn.fitFont = function(w, h, minFont, maxFont) {
var oldpos = this.css("position");
this.css({
position: "absolute",
maxWidth: w
});
var wrappers = this.wrapInner("<span/>").children();
var that = this;
this.css("font-size", dichotomy(parseInt(this.css("font-size"), 10), function(x) {
that.css("fontSize", x);
return (wrappers.maxHeight() > h || wrappers.maxWidth() > w);
}).clip(minFont || 0, maxFont || Infinity));
// Restore stuff
this.css("position", oldpos);
wrappers.children().unwrap();
return this;
}
$.fn.fitIn = function(e, t, r, b, l) {
e = $(e);
if (isNaN(+t)) t = 0;
if (isNaN(+r)) r = t;
if (isNaN(+b)) b = t;
if (isNaN(+l)) l = r;
var w = e.width();
var h = e.height();
t *= h;
r *= w;
b *= h;
l *= w;
this.fitFont(w - r - l, h - t - b, 20).center(e.center());
}
function queueize(method) {
return function() {
var $this = this;
return this.queue(function(next) {
$this[method].apply($this,arguments);
next();
});
};
}
$.fn.qAddClass = queueize("addClass");
$.fn.qRemoveClass = queueize("removeClass");
$.fn.wh = function(w, h) {
return this.width(w).height(h);
}
$.fn.relativePos = function(xAnchor, yAnchor, to, justCss) {
if (to) this.css("position", "absolute");
var deltaX = this.outerWidth() * xAnchor;
var deltaY = this.outerHeight() * yAnchor;
if (to) {
var css = {
left: to.left - deltaX,
top: to.top - deltaY
};
return (justCss ? css : this.offset(css));
} else {
var pos = this.offset();
pos.left += deltaX;
pos.top += deltaY;
return pos;
}
};
$.each({
center: {x:0.5, y:0.5},
north: {x:0.5, y:0},
northEast: {x:1, y:0},
east: {x:1, y:0.5},
southEast: {x:1, y:1},
south: {x:0.5, y:1},
southWest: {x:0, y:1},
west: {x:0, y:0.5},
northWest: {x:0, y:0},
}, function(i,e) {
var x = e.x;
var y = e.y;
$.fn[i] = function(to, justCss) { return this.relativePos(x, y, to, justCss); };
});

129
code/html5/pticlic.js Normal file
View File

@ -0,0 +1,129 @@
function jss() {
// TODO : réduire le nombre de fitIn ou fitFont, ou bien les précalculer.
var w, h;
w = $(window).width();
h = $(window).height();
var mch = h/8, mnh = h*0.075;
$("body, html")
.css({
padding: 0,
margin: 0,
overflow: "hidden",
textAlign: "left"
});
$("#screen")
.wh(w, h)
.north($("body").north()); // TODO : par rapport à la fenêtre entière.
$("#mc-caption-block")
.wh(w, mch)
.north($("#screen").north());
$("#mc-caption")
.fitIn("#mc-caption-block", 0.1);
$("#mn-caption-block")
.css({borderWidth: h/100})
.wh(w, mnh)
.north($("#mc-caption-block").south());
$("#mn-caption")
.css({zIndex: 10})
.fitIn("#mn-caption-block");
$(".relationBox:visible")
.css({
margin: 10,
padding: 10,
MozBorderRadius: 10,
WebkitBorderRadius: 10
});
$(".relationBox:visible .icon")
.wh(72,72)
.css({
float: "left",
marginRight: $(".relationBox").css("padding-left")
});
$(".relations")
.width(w);
$(".relation:visible").fitFont($(".relationBox:visible").width(), 72, 10);
$(".relations")
.south($("#screen").south());
}
$(function () {
var url = "tmp.json";
$.getJSON(url, function(data) {
var game = data[0];
var currentWordNb = 0;
var answers = [];
var updateText = function() {
$(".mn").text(game.cloud[currentWordNb].name);
$(".mc").text(game.center.name);
jss();
}
var nextWord = function(click, button) {
answers[currentWordNb++] = $(button).data("rid");
if (currentWordNb < game.cloud.length) {
animateNext(click, button);
} else {
$(".relations").empty();
alert("Partie terminée !");
}
}
function animateNext(click, button) {
var duration = 700;
var mn = $("#mn-caption");
$(button).addClass("hot").removeClass("hot", duration);
(mn)
.stop() // Attention : stop() et clearQueue() ont aussi un effet
.clearQueue() // sur la 2e utilisation de mn (ci-dessous).
.clone()
.removeClass("mn") // Pour que le texte animé ne soit pas modifié.
.appendTo("body") // Append to body so we can animate the offset (instead of top/left).
.offset(mn.offset())
.animate({left:click.left, top:click.top, fontSize: 0}, duration)
.queue(function() { $(this).remove(); });
updateText();
var fs = mn.css("fontSize");
var mncbCenter = $("#mn-caption-block").center();
(mn)
.css("fontSize", 0)
.animate({fontSize: fs}, {duration:duration, step:function(){mn.center(mncbCenter);}});
}
$.each(game.relations, function(i, relation) {
$('#templates .relationBox')
.clone()
.data("rid", relation.id)
.find(".text")
.html(relation.name.replace(/%(m[cn])/g, '<span class="$1"/>'))
.end()
.find(".icon")
.attr("src", "img/rel/"+relation.id+".png")
.end()
.click(function(e) {
nextWord({left:e.pageX, top:e.pageY}, this);
})
.appendTo(".relations");
});
$(window).resize(jss);
updateText();
});
});

31
code/html5/score.html Normal file
View File

@ -0,0 +1,31 @@
<!DOCTYPE html>
<html>
<head>
<title>PtiClic pre-alpha 0.2</title>
<meta charset="utf-8" />
<style>
body {
background-color: black;
}
#screen {
background-color : #FFFFE0;
}
</style>
<script src="jquery-1.5.1.min.js"></script>
<script src="jquery-ui-1.8.11.custom.min.js"></script>
<script src="score.js"></script>
<script src="my-extensions.js"></script>
</head>
<body>
<div id="screen">
<h1>Score total : <span class="scoreTotal"></span></h1>
<div class="scores"></div>
<div id="templates" style="display: none;">
<div class="scoreLine">
<span class="word"></span> (<span class="score"></span>)
</div>
</div>
</div>
</body>
</html>

39
code/html5/score.js Normal file
View File

@ -0,0 +1,39 @@
function jss() {
var w, h;
w = $(window).width();
h = $(window).height();
var mch = h/8, mnh = h*0.075;
$("body, html")
.css({
padding: 0,
margin: 0,
overflow: "hidden",
textAlign: "left"
});
$("#screen")
.wh(w, h)
.north($("body").north()); // TODO : par rapport à la fenêtre entière.
}
$(function () {
var url = "score.json";
$.getJSON(url, function(data) {
console.log(data);
$.each(data.scores, function(i,e) {
var percentScore = (e.score - data.minScore) / (data.maxScore - data.minScore);
$("#templates .scoreLine")
.clone()
.find(".word").text(e.name).end()
.find(".score")
.text(e.score)
.css("color","rgb("+(255 - 255*percentScore).clip(0,255)+","+(191*percentScore).clip(0,255,true)+",0)")
.end()
.appendTo(".scores");
jss();
});
});
jss();
});

1
code/html5/score.json Normal file
View File

@ -0,0 +1 @@
{"minScore":-5,"maxScore":10,"scores":[{"id":84632,"name":"camion","score":3},{"id":61939,"name":"transbahutage","score":10},{"id":104263,"name":"trimbaler","score":4},{"id":44654,"name":"transporter","score":-2},{"id":38285,"name":"d\u00e9m\u00e9nageur","score":5},{"id":43404,"name":"porter","score":5},{"id":63192,"name":"transports","score":-1},{"id":130473,"name":"enthousiasmer","score":0},{"id":90461,"name":"se trimbaler","score":6},{"id":134609,"name":"baguenauder","score":9}]}

1
code/html5/tmp.json Normal file
View File

@ -0,0 +1 @@
[{"gid":22,"pgid":512,"relations":[{"id":10,"name":"%mc fait partie de %mn"},{"id":9,"name":"%mn est une partie de %mc"},{"id":0,"name":"%mc est en rapport avec %mn"},{"id":-1,"name":"%mn n'est pas lié à %mc"}],"center":{"id":28282,"name":"transbahuter"},"cloudsize":10,"cloud":[{"id":84632,"name":"camion"},{"id":61939,"name":"transbahutage"},{"id":104263,"name":"trimbaler"},{"id":44654,"name":"transporter"},{"id":38285,"name":"d\u00e9m\u00e9nageur"},{"id":43404,"name":"porter"},{"id":63192,"name":"transports"},{"id":130473,"name":"enthousiasmer"},{"id":90461,"name":"se trimbaler"},{"id":134609,"name":"baguenauder"}]}]

82
code/serveur/php/pticlic.php
View File

@ -2,6 +2,7 @@
require_once("relations.php");
require_once("db.php");
require_once("ressources/errors.inc")
/* Les prototypes des fonctions :
* ===============================>
@ -40,7 +41,7 @@ require_once("db.php");
function checkLogin($user, $passwd) {
$db = getDB();
$hashPasswd = md5($passwd);
$loginIsOk = ($hashPasswd == $db->querySingle("SELECT hash_passwd FROM user WHERE login='".$user."';"));
$loginIsOk = ($hashPasswd == $db->querySingle(sqlGetPassword($user)));
return $loginIsOk;
}
@ -50,7 +51,7 @@ function checkLogin($user, $passwd) {
function randomCenterNode()
{
$db = getDB();
return $db->querySingle("select eid from random_center_node where rowid = (abs(random()) % (select max(rowid) from random_center_node))+1;");
return $db->querySingle(sqlGetEIDCenterNode());
}
/** Selectionne aléatoirement un noeud d'un nuage.
@ -59,7 +60,7 @@ function randomCenterNode()
function randomCloudNode()
{
$db = getDB();
return $db->querySingle("select eid from random_cloud_node where rowid = (abs(random()) % (select max(rowid) from random_cloud_node))+1;");
return $db->querySingle(sqlGetEIRCloudNode());
}
/**
@ -75,32 +76,16 @@ function cgBuildResultSets($cloudSize, $centerEid, $r1, $r2)
// Le select doit ranvoyer trois colonnes :
// eid => l'eid du mot à mettre dans le nuage,
// r1 => la probabilité pour que le mot soit dans r1, entre -1 et 1 (négatif = ne devrait pas y être, positif = devrait y être à coup sûr, 0 = on sait pas).
$typer1r2 = "type in ($r1, $r2)";
$banned_types = "4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001";
$sources = array(
// Voisins 1 saut du bon type (= relations déjà existantes)
array('w'=>40, 'd'=>1, 's'=>"select end as eid, type = $r1 as r1, type = $r2 as r2, 0 as r0, 0 as trash from relation where start = $centerEid and $typer1r2 order by random();"),
// Voisins 1 saut via r_associated (0), donc qu'on voudrait spécifier si possible.
array('w'=>40, 'd'=>2, 's'=>"select end as eid, 0.25 as r1, 0.25 as r2, 0.5 as r0, 0 as trash from relation where start = $centerEid and type = 0 order by random();"),
// Voisins 1 saut via les autres relations
array('w'=>20, 'd'=>3.1, 's'=>"select end as eid, 0.1 as r1, 0.1 as r2, 0.8 as r0, 0 as trash from relation where start = $centerEid and type not in (0, $r1, $r2, $banned_types) order by random();"),
// Voisins 2 sauts, avec un mix de R1 et R2 pour les liens. Par ex [ A -R1-> B -R2-> C ] ou bien [ A -R2-> B -R2-> C ]
// Version optimisée de : "select end as eid from relation where $typer1r2 and start in oneHopWithType order by random();"
array('w'=>30, 'd'=>3.2, 's'=>"select B.end as eid, ((A.type = $r1) + (B.type = $r1)) / 3. as r1, ((A.type = $r2) + (B.type = $r2)) / 3. as r2, 1/6. as r0, 1/6. as trash from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.$typer1r2 order by random();"),
// Voisins 1 saut r1/r2 + 1 saut synonyme
// Version optimisée de : "select end as eid from relation where start in oneHopWithType and type = 5 order by random()";
array('w'=>20, 'd'=>5, 's'=>"select B.end as eid, (A.type = $r1) * 0.75 as r1, (A.type = $r2) * 0.75 as r2, 0.25 as r0, 0 as trash from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.type = 5 order by random();"),
// Version optimisée de : "select end as eid from relation where start in (select end from relation where start = $centerEid and type = 5) and $typer1r2 order by random();"
array('w'=>20, 'd'=>6, 's'=>"select B.end as eid, (B.type = $r1) * 0.75 as r1, (B.type = $r2) * 0.75 as r2, 0.25 as r0, 0 as trash from relation as A, relation as B where A.start = $centerEid and A.type = 5 and B.start = A.end and B.$typer1r2 order by random();"),
// Voisins 2 sauts (tous)
// Version optimisée de : "select end as eid, 0.1 as r1, 0.1 as r2, 0.3 as r0, 0.5 as trash from relation where start in (select end from relation where start = $centerEid and type not in ($banned_types)) and type not in ($banned_types) order by random();"
array('w'=>10, 'd'=>8, 's'=>"select x as eid, 0.1 as r1, 0.1 as r2, 0.3 as r0, 0.5 as trash from (select x from (select X.eid + Y.dumb as x from (select B.end as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.start = A.end limit ".($cloudSize*4).") as X, (select 0 as dumb) as Y)) order by random();"),
// Centre pointe vers X, M pointe vers X aussi, on prend M.
// Version optimisée de : "select start as eid from relation where end in (select end from relation where start = $centerEid) and type not in ($banned_types) order by random();"
// Ce n'est toujours pas ça… : "select eid from (select B.start as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.end = A.end limit 1) order by random();"
// Tordu, mais ça marche \o/ . En fait il faut empêcher l'optimiseur de ramener le random avant le limit (et l'optimiseur est malin… :)
array('w'=>10, 'd'=>8, 's'=>"select x as eid, 0.1 as r1, 0.1 as r2, 0.2 as r0, 0.6 as trash from (select x from (select X.eid + Y.dumb as x from (select B.start as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.end = A.end limit ".($cloudSize*4).") as X, (select 0 as dumb) as Y)) order by random();"),
array('w'=>40, 'd'=>1, 's'=>sql1JumpGoodType($r1, $r2, $centerEid)),
array('w'=>40, 'd'=>2, 's'=>sql1JumpViaRAssociated0($centerEid)),
array('w'=>20, 'd'=>3.1, 's'=>sql1JumpViaOtherRelation($centerEid, $r1, $r2, $banned_types)),
array('w'=>30, 'd'=>3.2, 's'=>sql2JumpWithMixR1R2ForLinks($r1, $r2, $centerEid)),
array('w'=>20, 'd'=>5, 's'=>sql1JumpR1DivR2Plus1JumpSynonymOneHopWithType($r1, $r2, $centerEid)),
array('w'=>20, 'd'=>6, 's'=>sql1JumpR1DivR2Plus1JumpSynonym($r1, $r2, $centerEid)),
array('w'=>10, 'd'=>8, 's'=>sql2JumpAll($centerEid, $cloudSize)),
array('w'=>10, 'd'=>8, 's'=>sqlXPointsToMMPointsToXTakeM($cloudSize)),
'rand' => array('w'=>5, 'd'=>10, 's'=>false) // random. Le r1 et r2 de random sont juste en-dessous
);
@ -216,7 +201,7 @@ function cgBuildCloud($centerEid, $cloudSize, $sources, $sumWeights)
$rejected = false;
// Ne pas mettre le mot central dans le nuage.
if ($res['eid'] == $centerEid) { continue; }
$nodeName = $db->querySingle("select name from node where eid=".$res['eid'].";");
$nodeName = $db->querySingle(sqlGetNameFromNode($res));
if (substr($nodeName, 0, 2) == "::") { continue; }
foreach ($cloud as $c) {
if ($c['eid'] == $res['eid']) {
@ -302,7 +287,7 @@ function cgInsert($centerEid, $cloud, $r1, $r2, $totalDifficulty)
*/
function randomGameCore() {
$db = getDB();
return $db->querySingle("select gid from game where gid = (abs(random()) % (select max(gid) from game))+1 or gid = (select max(gid) from game where gid > 0) order by gid limit 1;");
return $db->querySingle(sqlGetGidFromGame());
}
/** Sélection aléatoire d'une partie de la base de données parmis les parties à jouer.
@ -320,7 +305,7 @@ function randomGame()
$gid = randomGameCore();
if ($gid === null)
throw new Exception("Erreur lors de la récupération de la partie. Vérifiez qu'il y a au moins une partie.", 6);
errGetGame();
}
return $gid;
}
@ -337,11 +322,11 @@ function formatWord($word) {
while (($pos = strpos($word, ">")) !== false) {
$res .= substr($word,0,$pos) . " (";
$eid = intval(substr($word,$pos+1));
if ($eid == 0) { throw new Exception("Erreur lors du suivi des pointeurs de spécialisation du mot $word.", 7); }
if (in_array($eid, $stack)) { throw new Exception("Boucle rencontrée lors du suivi des pointeurs de spécialisation du mot $word.", 8); }
if (count($stack) > 10) { throw new Exception("Trop de niveaux de récursions lors du suivi des pointeurs de spécialisation du mot $word.", 9); }
if ($eid == 0) { errFollowingPointer($word); }
if (in_array($eid, $stack)) { errLoopDetected($word); }
if (count($stack) > 10) { errTooMuchRecursion($word); }
$stack[] = $eid;
$word = $db->querySingle("select name from node where eid = $eid");
$word = $db->querySingle(sqlGetNameFromNodeWithEid($eid));
}
$res .= $word;
@ -364,8 +349,7 @@ function game2json($user, $gameId)
$db->exec("INSERT INTO played_game(pgid, gid, login, timestamp) VALUES (null, ".$gameId.", '$user', -1);");
$pgid = $db->lastInsertRowID();
// TODO Yoann : faire des tests d'erreur pour ces select ?
$game = $db->query("select gid, (select name from node where eid = eid_central_word) as name_central_word, eid_central_word, relation_1, relation_2 from game where gid = ".$gameId.";");
$game = $db->query(sqlGetGamesForId($gameId));
$game = $game->fetchArray();
$retstr = "";
@ -373,7 +357,7 @@ function game2json($user, $gameId)
$retstr .= '"center":{"id":'.$game['eid_central_word'].',"name":'.json_encode(''.formatWord($game['name_central_word'])).'},';
$retstr .= '"cloudsize":10,"cloud":['; // TODO ! compter dynamiquement.
$res = $db->query("select eid_word,(select name from node where eid=eid_word) as name_word from game_cloud where gid = ".$gameId.";");
$res = $db->query(sqlGetWordEidAndName($gameId));
$notfirst = false;
while ($x = $res->fetchArray())
@ -403,7 +387,7 @@ function game2array($user, $gameId)
$pgid = $db->lastInsertRowID();
// TODO Yoann : faire des tests d'erreur pour ces select ?
$game = $db->query("select gid, (select name from node where eid = eid_central_word) as name_central_word, eid_central_word, relation_1, relation_2 from game where gid = ".$gameId.";");
$game = $db->query(sqlGetGamesForId($gameId));
$game = $game->fetchArray();
$ret = array();
@ -416,7 +400,7 @@ function game2array($user, $gameId)
$ret['center'] = array('id' => $game['eid_central_word'], 'name' => formatWord($game['name_central_word']));
$ret['cloud'] = array(); // TODO ! compter dynamiquement.
$res = $db->query("select eid_word,(select name from node where eid=eid_word) as name_word, num, difficulty, totalWeight, probaR1, probaR2, probaR0, probaTrash from game_cloud where gid = ".$gameId.";");
$res = $db->query(sqlGetInformationAboutGame($gameId));
while ($x = $res->fetchArray())
{
@ -533,11 +517,11 @@ function normalizeProbas($row) {
function setGame($user, $pgid, $gid, $answers)
{
$db = getDB();
if ('ok' !== $db->querySingle("SELECT 'ok' FROM played_game WHERE pgid = $pgid and $gid = $gid and login = '$user' and timestamp = -1;")) {
if ('ok' !== $db->querySingle(sqlGameIsOK($pgid, $gid, $user))) {
return getGameScores($user, $pgid, $gid);
}
$userReputation = computeUserReputation($db->querySingle("SELECT score FROM user WHERE login='".$user."';"));
$userReputation = computeUserReputation($db->querySingle(sqlGetScoreForUser($user)));
$db->exec("begin transaction;");
$db->exec("update played_game set timestamp = ".time()." where pgid = $pgid;");
@ -557,7 +541,7 @@ function setGame($user, $pgid, $gid, $answers)
$num = intval($row['num']);
$nbScores++;
if (!isset($answers[$num])) {
throw new Exception("Cette requête \"Set partie\" ne donne pas de réponse (une relation) pour le mot numéro $num de la partie.", 5);
errSetPartiNoRelation($num);
}
$relanswer = intval($answers[$num]);
@ -567,7 +551,7 @@ function setGame($user, $pgid, $gid, $answers)
case $r2: $answer = 1; $probaRx = "probaR2"; break;
case $r0: $answer = 2; $probaRx = "probaR0"; break;
case $trash: $answer = 3; $probaRx = "probaTrash"; break;
default: throw new Exception("Réponse ($relanswer) invalide pour le mot $num. Les réponses possibles sont : $r1, $r2, $r0, $trash", 5);
default: errAnswerInvalidForWord($r1, $r2, $r0, $trash);
}
$wordScore = computeScore(normalizeProbas($row), $row['difficulty'], $answer, $userReputation);
@ -589,17 +573,17 @@ function setGame($user, $pgid, $gid, $answers)
function getGameScores($user, $pgid, $gid) {
$db = getDB();
$timestamp = $db->querySingle("SELECT timestamp FROM played_game WHERE pgid = $pgid and $gid = $gid and login = '$user';");
$timestamp = $db->querySingle(sqlGetPlayedGameTime($pgid, $gid, $user));
if ($timestamp == -1) {
throw new Exception("Cette partie n'a jamais été jouée.", 4); // TODO : code d'erreur en doublon avec celui ci-dessous.
errGameNeverPlayed();
} else if ($timestamp == null) {
throw new Exception("Cette partie n'est associée à votre nom d'utilisateur.", 4);
errGameNotAssociatedWithUser();
}
$gameScore = 0;
$scores = array();
$nbScores = 0;
$res = $db->query("SELECT num,score from played_game_cloud where pgid = $pgid and gid = $gid;");
$res = $db->query(sqlGetNumAndScoreFromGame($pgid, $gid));
while ($row = $res->fetchArray())
{
$nbScores++;
@ -665,7 +649,7 @@ function setGameGetScore($user, $pgid, $gid, $answers) {
function insertNode($node) {
$db = getDB();
if($db->querySingle("SELECT eid FROM node WHERE name='".SQLite3::escapeString($node)."'") == null) {
if($db->querySingle(sqlGetEidFromNode($node)) == null) {
$db->exec("INSERT INTO node(name,type,weight) VALUES('".SQLite3::escapeString($node)."',1,50);");
return true;
}
@ -681,7 +665,7 @@ function insertNode($node) {
function getNodeEid($node) {
$db = getDB();
return $db->querySingle("SELECT eid FROM node WHERE name='".SQLite3::escapeString($node)."';");
return $db->querySingle(sqlGetEidFromNode($node));
}
function wordExist($node) {

83
code/serveur/php/relations.php
View File

@ -1,45 +1,46 @@
<?php
$stringRelations = array(
-1 => "Mot non lié à 'mot central'",
0 => "'mot central' est en rapport avec...",
//1 => "raffinement sémantique", // pas utilisé
//2 => "raffinement morphologique", // pas utilisé
//3 => "domaine", // pas utilisé
//4 => "r_pos", // pas utilisé
5 => "'mot central' est un synonyme de...",
6 => "'mot central' est une sorte de...",
7 => "Un contraire de 'mot central' est...",
8 => "Un spécifique de 'mot central' est...",
9 => "... est une partie de 'mot central'",
10 => "'mot central' fait partie de...",
//11 => "locution", // pas utilisé
//12 => "potentiel de FL", // pas utilisé
13 => "Quoi/Qui pourrait 'mot central'",
//14 => "action>patient", // pas utilisé
15 => "Le lieu pour 'mot central' est...",
16 => "Un instrument pour 'mot central' est...",
17 => "Un caractéristique de 'mot central' est...",
//18 => "r_data", // pas utilisé
//19 => "r_lemma", // pas utilisé
//20 => "magn", // pas utilisé
//21 => "antimagn", // pas utilisé
22 => "'mot central' est de la même famille que...",
//29 => "predicat", // pas utilisé
//30 => "lieu>action", // pas utilisé
//31 => "action>lieu", // pas utilisé
//32 => "sentiment", // pas utilisé
//33 => "erreur", // pas utilisé
//34 => "manière", // pas utilisé
//35 => "sens/signification", // pas utilisé
//36 => "information potentielle", // pas utilisé
//37 => "rôle télique", // pas utilisé
//38 => "rôle agentif", // pas utilisé
//41 => "conséquence", // pas utilisé
//42 => "cause", // pas utilisé
//52 => "succession", // pas utilisé
//53 => "produit", // pas utilisé
//54 => "est le produit de", // pas utilisé
//55 => "s'oppose à"
);
-1 => "%mn n'est pas lié à %mc",
0 => "%mc est en rapport avec %mn",
//1 => "raffinement sémantique", // pas utilisé
//2 => "raffinement morphologique", // pas utilisé
//3 => "domaine", // pas utilisé
//4 => "r_pos", // pas utilisé
5 => "%mc est un synonyme de %mn",
6 => "%mc est une sorte de %mn",
7 => "Un contraire de %mc est %mn",
8 => "Un spécifique de %mc est %mn",
9 => "%mn est une partie de %mc",
10 => "%mc fait partie de %mn",
//11 => "locution", // pas utilisé
//12 => "potentiel de FL", // pas utilisé
13 => "Quoi/Qui pourrait %mc",
//14 => "action>patient", // pas utilisé
15 => "Le lieu pour %mc est %mn",
16 => "Un instrument pour %mc est %mn",
17 => "Un caractéristique de %mc est %mn",
//18 => "r_data", // pas utilisé
//19 => "r_lemma", // pas utilisé
//20 => "magn", // pas utilisé
//21 => "antimagn", // pas utilisé
22 => "%mc est de la même famille que %mn",
//29 => "predicat", // pas utilisé
//30 => "lieu>action", // pas utilisé
//31 => "action>lieu", // pas utilisé
//32 => "sentiment", // pas utilisé
//33 => "erreur", // pas utilisé
//34 => "manière", // pas utilisé
//35 => "sens/signification", // pas utilisé
//36 => "information potentielle", // pas utilisé
//37 => "rôle télique", // pas utilisé
//38 => "rôle agentif", // pas utilisé
//41 => "conséquence", // pas utilisé
//42 => "cause", // pas utilisé
//52 => "succession", // pas utilisé
//53 => "produit", // pas utilisé
//54 => "est le produit de", // pas utilisé
//55 => "s'oppose à"
);
?>

43
code/serveur/php/ressources/errors.inc Normal file
View File

@ -0,0 +1,43 @@
function errRequestIncomplete() {
throw new Exception("La requête est incomplète", 1);
}
function errUserUnknownOrBadPassword() {
throw new Exception("Utilisateur non enregistré ou mauvais mot de passe", 2);
}
function errGameNeverPlayed() {
throw new Exception("Cette partie n'a jamais été jouée.", 3); // TODO : code d'erreur en doublon avec celui ci-dessous.
}
function errGameNotAssociatedWithUser() {
throw new Exception("Cette partie n'est pas associée à votre nom d'utilisateur.", 4);
}
function errAnswerInvalidForWord($r1, $r2, $r0, $trash) {
throw new Exception("Réponse ($relanswer) invalide pour le mot $num. Les réponses possibles sont : $r1, $r2, $r0, $trash", 5);
}
function errSetPartiNoRelation($num) {
throw new Exception("Cette requête \"Set partie\" ne donne pas de réponse (une relation) pour le mot numéro $num de la partie.", 6);
}
function errGetGame() {
throw new Exception("Erreur lors de la récupération de la partie. Vérifiez qu'il y a au moins une partie.", 7);
}
function errFollowingPointer($word) {
throw new Exception("Erreur lors du suivi des pointeurs de spécialisation du mot $word.", 8); }
}
function errLoopDetected($word) {
throw new Exception("Boucle rencontrée lors du suivi des pointeurs de spécialisation du mot $word.", 9); }
}
function errTooMuchRecursion($word) {
throw new Exception("Trop de niveaux de récursions lors du suivi des pointeurs de spécialisation du mot $word.", 10); }
}
function errUnknownCommand() {
throw new Exception("Commande inconnue", 11);
}

119
code/serveur/php/ressources/sql.inc Normal file
View File

@ -0,0 +1,119 @@
$typer1r2 = "type in ($r1, $r2)";
$banned_types = "4, 12, 36, 18, 29, 45, 46, 47, 48, 1000, 1001";
function sqlGetPassword($user) {
return "SELECT hash_passwd FROM user WHERE login='".$user."';";
}
function sqlGetEIDCenterNode() {
return "select eid from random_center_node where rowid = (abs(random()) % (select max(rowid) from random_center_node))+1;";
}
function sqlGetEIRCloudNode() {
return "select eid from random_cloud_node where rowid = (abs(random()) % (select max(rowid) from random_cloud_node))+1;";
}
// Voisins 1 saut du bon type (= relations déjà existantes)
function sql1JumpGoodType($r1, $r2, $centerEid) {
global $typer1r2;
return "select end as eid, type = $r1 as r1, type = $r2 as r2, 0 as r0, 0 as trash from relation where start = $centerEid and $typer1r2 order by random();";
}
// Voisins 1 saut via r_associated (0), donc qu'on voudrait spécifier si possible.
function sql1JumpViaRAssociated0($centerEid) {
return "select end as eid, 0.25 as r1, 0.25 as r2, 0.5 as r0, 0 as trash from relation where start = $centerEid and type = 0 order by random();";
}
// Voisins 1 saut via les autres relations
function sql1JumpViaOtherRelation($centerEid, $r1, $r2) {
global $banned_types;
return "select end as eid, 0.1 as r1, 0.1 as r2, 0.8 as r0, 0 as trash from relation where start = $centerEid and type not in (0, $r1, $r2, $banned_types) order by random();";
}
// Voisins 2 sauts, avec un mix de R1 et R2 pour les liens. Par ex [ A -R1-> B -R2-> C ] ou bien [ A -R2-> B -R2-> C ]
// Version optimisée de : "select end as eid from relation where $typer1r2 and start in oneHopWithType order by random();"
function sql2JumpWithMixR1R2ForLinks($r1, $r2, $centerEid) {
global $typer1r2;
return "select B.end as eid, ((A.type = $r1) + (B.type = $r1)) / 3. as r1, ((A.type = $r2) + (B.type = $r2)) / 3. as r2, 1/6. as r0, 1/6. as trash from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.$typer1r2 order by random();";
}
// Voisins 1 saut r1/r2 + 1 saut synonyme
// Version optimisée de : "select end as eid from relation where start in oneHopWithType and type = 5 order by random()";
function sql1JumpR1DivR2Plus1JumpSynonymOneHopWithType($r1, $r2, $centerEid) {
global $typer1r2;
return "select B.end as eid, (A.type = $r1) * 0.75 as r1, (A.type = $r2) * 0.75 as r2, 0.25 as r0, 0 as trash from relation as A, relation as B where A.start = $centerEid and A.$typer1r2 and B.start = A.end and B.type = 5 order by random();";
}
// Version optimisée de : "select end as eid from relation where start in (select end from relation where start = $centerEid and type = 5) and $typer1r2 order by random();"
function sql1JumpR1DivR2Plus1JumpSynonym($r1, $r2, $centerEid) {
global $typer1r2;
return "select B.end as eid, (B.type = $r1) * 0.75 as r1, (B.type = $r2) * 0.75 as r2, 0.25 as r0, 0 as trash from relation as A, relation as B where A.start = $centerEid and A.type = 5 and B.start = A.end and B.$typer1r2 order by random();";
}
// Voisins 2 sauts (tous)
// Version optimisée de : "select end as eid, 0.1 as r1, 0.1 as r2, 0.3 as r0, 0.5 as trash from relation where start in (select end from relation where start = $centerEid and type not in ($banned_types)) and type not in ($banned_types) order by random();"
function sql2JumpAll($centerEid, $cloudSize) {
global $banned_types;
return "select x as eid, 0.1 as r1, 0.1 as r2, 0.3 as r0, 0.5 as trash from (select x from (select X.eid + Y.dumb as x from (select B.end as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.start = A.end limit ".($cloudSize*4).") as X, (select 0 as dumb) as Y)) order by random();";
}
// Centre pointe vers X, M pointe vers X aussi, on prend M.
// Version optimisée de : "select start as eid from relation where end in (select end from relation where start = $centerEid) and type not in ($banned_types) order by random();"
// Ce n'est toujours pas ça… : "select eid from (select B.start as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.end = A.end limit 1) order by random();"
// Tordu, mais ça marche \o/ . En fait il faut empêcher l'optimiseur de ramener le random avant le limit (et l'optimiseur est malin… :)
function sqlXPointsToMMPointsToXTakeM($cloudSize) {
global $banned_types;
return "select x as eid, 0.1 as r1, 0.1 as r2, 0.2 as r0, 0.6 as trash from (select x from (select X.eid + Y.dumb as x from (select B.start as eid from relation as A, relation as B where A.type not in ($banned_types) and A.start = $centerEid and B.type not in ($banned_types) and B.end = A.end limit ".($cloudSize*4).") as X, (select 0 as dumb) as Y)) order by random();";
}
function sqlGetNameFromNode($res) {
return "select name from node where eid=".$res['eid'].";";
}
function sqlGetGidFromGame() {
return "select gid from game where gid = (abs(random()) % (select max(gid) from game))+1 or gid = (select max(gid) from game where gid > 0) order by gid limit 1;";
}
function sqlGetNameFromNodeWithEid($eid) {
return "select name from node where eid = $eid";
}
// TODO Yoann : faire des tests d'erreur pour ces select ?
function sqlGetGamesForId($gameId) {
return "select gid, (select name from node where eid = eid_central_word) as name_central_word, eid_central_word, relation_1, relation_2 from game where gid = ".$gameId.";";
}
function sqlGetWordEidAndName($gameId) {
return "select eid_word,(select name from node where eid=eid_word) as name_word from game_cloud where gid = ".$gameId.";";
}
function sqlGetInformationAboutGame($gameId) {
return "select eid_word,(select name from node where eid=eid_word) as name_word, num, difficulty, totalWeight, probaR1, probaR2, probaR0, probaTrash from game_cloud where gid = ".$gameId.";";
}
function sqlGameIsOK($pgid, $gid, $user) {
return "SELECT 'ok' FROM played_game WHERE pgid = $pgid and $gid = $gid and login = '$user' and timestamp = -1;";
}
function sqlGetScoreForUser($user) {
return "SELECT score FROM user WHERE login='".$user."';";
}
function sqlGetPlayedGameTime($pgid, $gid, $user) {
return "SELECT timestamp FROM played_game WHERE pgid = $pgid and $gid = $gid and login = '$user';";
}
function sqlGetNumAndScoreFromGame($pgid, $gid) {
return "SELECT num,score from played_game_cloud where pgid = $pgid and gid = $gid;";
}
function sqlGetEidFromNode($node) {
return "SELECT eid FROM node WHERE name='".SQLite3::escapeString($node)."'";
}

18
code/serveur/php/server.php
View File

@ -31,7 +31,7 @@ function logError($errNum, $msg, $other="")
function main()
{
if(!isset($_GET['action']) || !isset($_GET['user']) || !isset($_GET['passwd'])) {
throw new Exception("La requête est incomplète", 2);
errRequestIncomplete();
}
// Login
@ -39,7 +39,7 @@ function main()
$user = SQLite3::escapeString($_GET['user']);
$loginIsOk = checkLogin($user, $_GET['passwd']);
if ($action != 3 && (!$loginIsOk)) {
throw new Exception("Utilisateur non enregistré ou mauvais mot de passe", 3);
errUserUnknownOrBadPassword();
}
if ($action == 3) {
echo '{"login_ok":' . ($loginIsOk ? 'true' : 'false') . '}';
@ -53,7 +53,7 @@ function main()
if ($action == 2) { // "Create partie"
// Requête POST : http://serveur/server.php?action=2&nb=2&mode=normal&user=foo&passwd=bar
if (!isset($_GET['nb']) || !isset($_GET['mode'])) {
throw new Exception("La requête est incomplète", 2);
errRequestIncomplete();
}
createGame(intval($_GET['nb']), $_GET['mode']);
echo '{"success":1}';
@ -61,14 +61,14 @@ function main()
else if($action == 0) { // "Get partie"
// Requête POST : http://serveur/server.php?action=0&nb=2&mode=normal&user=foo&passwd=bar
if(!isset($_GET['nb']) || !isset($_GET['mode'])) {
throw new Exception("La requête est incomplète", 2);
errRequestIncomplete();
}
getGame($user, intval($_GET['nb']), $_GET['mode']);
}
else if($action == 1) { // "Set partie"
// Requête POST : http://serveur/server.php?action=1&mode=normal&user=foo&passwd=bar&gid=1234&pgid=12357&0=0&1=-1&2=22&3=13&9=-1
if (!isset($_GET['pgid']) || !isset($_GET['gid'])) {
throw new Exception("La requête est incomplète", 2);
errRequestIncomplete();
}
// TODO : il faudrait filtrer les paramètres qui correspondent à une réponse
// au lieu d'envoyer $_GET en entier, mais on ne connaît pas leur nom à l'avance.
@ -76,7 +76,7 @@ function main()
}
else if($action == 4) { // CheckWord
if (!isset($_GET['word']))
throw new Exception("La requête est incomplète", 2);
errRequestIncomplete();
if(wordExist($_GET['word']))
echo true;
@ -87,10 +87,8 @@ function main()
echo getGameRelationsJSON();
}
else {
throw new Exception("Commande inconnue", 2);
}
errUnknownCommand();
}
}
function server() {

3
organisation/notes
View File

@ -1,3 +1,5 @@
2010-03-29 : TODO : s'assurer dans le serveur que les mots du nuage sont envoyés dans l'ordre, et que les num sont *toujours* entre 0..n
NOTES DES PREMIERES REUNIONS (IL ME SEMBLE)
GEORGES'S NOTEBOOK (en vrac)
@ -68,7 +70,6 @@ version glisser-déposer le mot sur relation
******************
BUG : dans les parties qu'on génère, la somme des poids doit toujours être 2, or il y en a certaines où c'est 0 !?!