From b63136431eb950a9d68bd768a221f306d7d7d082 Mon Sep 17 00:00:00 2001 From: JLo'w Date: Fri, 6 May 2016 21:28:43 +0200 Subject: [PATCH] Déconnexion + gestion commande --- PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java | 78 ++++++++++++++++++++++++++++++++++++++++++++++++------------------------------ PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java | 7 +------ 2 files changed, 49 insertions(+), 36 deletions(-) diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java index 17f3153..a84b152 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java @@ -60,7 +60,7 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr mState = STATE_RIEN; mTimeToken = -1; - mToken = null; + mToken = ""; getActionBar().setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.colorPrimary))); mNfcAdapter = NfcAdapter.getDefaultAdapter(getApplicationContext()); @@ -199,40 +199,60 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr public void valideCommande(View v) { if((TextUtils.getTrimmedLength(mToken) == 30) && ((System.currentTimeMillis() - mTimeToken) < EXPIRATION)) { - EditText champMontant = (EditText) findViewById(R.id.commande_prix); - EditText champQuantite = (EditText) findViewById(R.id.commande_quantite); - float montant = 0.0f; - int quantite = 0; - - //TODO: gérer le XOR de pute - - try{ - montant = Float.parseFloat(champMontant.getText().toString()); - quantite = Integer.parseInt(champQuantite.getText().toString()); - } - catch (Throwable t) - { - Toast.makeText(this, "Remplir les champs avec des nombres: " + t.toString(), Toast.LENGTH_LONG).show(); - } - - if ((montant > 0.0f) && (montant < 200.0f) && (quantite > 0) && (mDroit >= 1)) { + if(mDroit >= 1){ mState = STATE_COMMANDE; - champMontant.setText(null); - champQuantite.setText(null); - Bundle b = new Bundle(); b.putString("token", mToken); b.putInt("state", mState); - b.putFloat("montant", montant); - b.putInt("quantite", quantite); NFCFragment nfc = new NFCFragment(); - nfc.setArguments(b); + switch (v.getId()){ + case R.id.commande_validation: + EditText champMontant = (EditText) findViewById(R.id.commande_prix); + float montant = 0.0f; + + try{ + montant = Float.parseFloat(champMontant.getText().toString().replace(",", ".")); + } + catch (Throwable t) + { + Toast.makeText(this, "Remplir le prix avec un nombre: " + t.toString(), Toast.LENGTH_SHORT).show(); + } + if ((montant > 0.0f) && (montant < 200.0f)) { + champMontant.setText(null); + b.putFloat("montant", montant); + b.putInt("quantite", 0); + } + else{ + Toast.makeText(this, "Valeur incorrecte.", Toast.LENGTH_SHORT).show(); + } + break; + case R.id.button1: + b.putInt("quantite", 1); + break; + case R.id.button2: + b.putInt("quantite", 2); + break; + case R.id.button3: + b.putInt("quantite", 3); + break; + case R.id.button4: + b.putInt("quantite", 4); + break; + case R.id.button5: + b.putInt("quantite", 5); + break; + case R.id.button6: + b.putInt("quantite", 6); + break; + } + + nfc.setArguments(b); getFragmentManager().beginTransaction().replace(R.id.fragment_container, nfc).addToBackStack(null).commit(); } else{ - Toast.makeText(this, "Valeur incorrecte ou droit insuffisant.", Toast.LENGTH_LONG).show(); + Toast.makeText(this, "Droit insuffisant.", Toast.LENGTH_SHORT).show(); } } else{ @@ -242,7 +262,6 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr public void valideRechargement(View v) { - System.out.println(TextUtils.getTrimmedLength(mToken)); if((TextUtils.getTrimmedLength(mToken) == 30) && ((System.currentTimeMillis() - mTimeToken) < EXPIRATION)) { EditText champMontant = (EditText) findViewById(R.id.rechargement_champ_montant); float montant = 0.0f; @@ -419,14 +438,13 @@ public class MainActivite extends Activity implements ASyncResponse, main_tab_fr } public void disconnect(){ - mToken = null; + mToken = ""; mDroit = 0; mUser = null; mTimeToken = -1; mState = STATE_RIEN; - Toast.makeText(this, "Veuillez vous reconnecter.", Toast.LENGTH_SHORT).show(); - final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); - viewPager.setCurrentItem(0); + Snackbar.make(findViewById(R.id.coordinator), "Veuillez vous reconnecter", Snackbar.LENGTH_SHORT).show(); + getFragmentManager().beginTransaction().replace(R.id.fragment_container, new ConnectionFragment()).commit(); } } diff --git a/PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java b/PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java index 17f72ac..eebd05d 100644 --- a/PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java +++ b/PremiereActivite/app/src/main/java/com/example/app_10p5/main_tab_frag.java @@ -1,6 +1,5 @@ package com.example.app_10p5; -import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.app.Fragment; @@ -9,8 +8,6 @@ import android.support.v4.view.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Toast; - public class main_tab_frag extends Fragment { @@ -51,9 +48,7 @@ public class main_tab_frag extends Fragment { viewPager.setCurrentItem(tab.getPosition()); } else{ - viewPager.setCurrentItem(tab.getPosition()); //Empeche un bug graphique - viewPager.setCurrentItem(0); - Toast.makeText(parent, "Veuillez vous connecter.", Toast.LENGTH_LONG).show(); + parent.disconnect(); } } -- libgit2 0.21.2