art.dambrine
/
java-app-network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

ClientAlreadyExistConfirmation vue + requêtes

master
art.dambrine 5 years ago
parent
861eeb5ce8
commit
f019e34af2
8 changed files with 497 additions and 181 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      app/src/main/AndroidManifest.xml
  2. 179
      app/src/main/java/com/speculos/myapplicationoc/ClientAlreadyExistConfirmation.java
  3. 24
      app/src/main/java/com/speculos/myapplicationoc/MyApplication.java
  4. 9
      app/src/main/java/com/speculos/myapplicationoc/TagDetectedActivityAdmin.java
  5. 154
      app/src/main/java/com/speculos/myapplicationoc/ThreadPing.java
  6. 131
      app/src/main/res/layout/activity_client_exist_confirmation.xml
  7. 12
      gradle/wrapper/gradle-wrapper.properties
  8. 168
      gradlew.bat

1
app/src/main/AndroidManifest.xml
View File

@ -25,6 +25,7 @@
<activity android:name=".TagDetectedActivity" /> <activity android:name=".TagDetectedActivity" />
<activity android:name=".TagDetectedActivityAdmin" /> <activity android:name=".TagDetectedActivityAdmin" />
<activity android:name=".PaymentActivity" /> <activity android:name=".PaymentActivity" />
<activity android:name=".ClientAlreadyExistConfirmation" />
</application> </application>
</manifest> </manifest>

179
app/src/main/java/com/speculos/myapplicationoc/ClientAlreadyExistConfirmation.java
View File

@ -0,0 +1,179 @@
package com.speculos.myapplicationoc;
import android.app.Activity;
import android.os.Bundle;
import android.os.StrictMode;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.Nullable;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
public class ClientAlreadyExistConfirmation extends Activity {
String hexa_id, mail, srvURL;
float solde, idClient;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// Tweak pour contourner l'erreur android.os.StrictMode$AndroidBlockGuardPolicy.onNetwork
StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
StrictMode.setThreadPolicy(policy);
// recuperation de MyApplication contenant les variables globales
MyApplication myApplication = (MyApplication) getApplication();
srvURL = myApplication.getServerURL();
setContentView(R.layout.activity_client_exist_confirmation);
hexa_id = getIntent().getStringExtra("hexa_id");
if (hexa_id == null) {
// TODO: afficher une erreur manque hexa_id
Toast.makeText(ClientAlreadyExistConfirmation.this, "Hexa_id non trouvé", Toast.LENGTH_LONG).show();
finish();
}
mail = getIntent().getStringExtra("mail");
/* Initialisation des info client*/
// Call API info client à partir du bracelet
String stringAPI = "";
try {
OkHttpClient client = new OkHttpClient().newBuilder()
.connectTimeout(2000, TimeUnit.MILLISECONDS)
.callTimeout(2000, TimeUnit.MILLISECONDS)
.build();
Request request = new Request.Builder()
.url(srvURL + "/api/clients.json?email=" + mail)
.method("GET", null)
.addHeader("Content-Type", "application/json")
.build();
Response response = client.newCall(request).execute();
String in = response.body().string();
in = in.substring(1, in.length() - 1); // on retire le [] autour de notre json premier et dernier char
Log.d("API-debug-in", in);
JSONObject jsonObject = null;
try {
jsonObject = new JSONObject(in);
Log.d("API-debug", "json: "+ jsonObject.toString());
// jsonObject = new JSONObject(jsonObject.get("client").toString()); // recup client embed dans l'objet parent
} catch (JSONException e) {
Log.d("API-debug", e.getMessage());
}
String mail = null;
mail = jsonObject.getString("email");
solde = Float.parseFloat(jsonObject.getString("solde"));
idClient = Float.parseFloat(jsonObject.getString("id"));
TextView value_mail = findViewById(R.id.value_mail);
value_mail.setText(mail);
JSONArray jsonBracelets = new JSONArray(jsonObject.get("bracelets").toString());
Log.d("API-debug", "NBBRACELETS: " + jsonBracelets.length());
int nbBracelets = jsonBracelets.length();
if (nbBracelets > 0) {
TextView textNbBracelets = findViewById(R.id.textNbBracelets);
// 1 bracelet
textNbBracelets.setText("avec " + nbBracelets + " bracelet");
// plusieurs bracelets
if (nbBracelets > 1)
textNbBracelets.setText("avec " + nbBracelets + " bracelets");
} else {
TextView textNbBracelets = findViewById(R.id.textNbBracelets);
textNbBracelets.setText("sans bracelet");
}
} catch (IOException | JSONException e) {
e.printStackTrace();
Log.d("API-debug-exception", e.getMessage());
Toast.makeText(ClientAlreadyExistConfirmation.this, e.getMessage(), Toast.LENGTH_LONG).show();
finish();
}
TextView value_solde = findViewById(R.id.value_solde);
value_solde.setText(solde + " €");
// Bouton de confirmation d'enregistrement
Button button_enregistrer = findViewById(R.id.button_enregistrer);
button_enregistrer.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// Requête ajout du bracelet au compte
// On peut maintenant link le bracelet grace à l'hexa_id et l'idClient
try {
OkHttpClient client = new OkHttpClient().newBuilder()
.build();
MediaType mediaType = MediaType.parse("application/json");
RequestBody body = RequestBody.create(mediaType, "{\"nfcId\": \"" + hexa_id + "\",\"client\": \"/api/clients/" + idClient + "\",\"state\": 0}");
Request request = new Request.Builder()
.url(srvURL + "/api/bracelets")
.method("POST", body)
.addHeader("Content-Type", "application/json")
.build();
Response responseHttp = client.newCall(request).execute();
if (responseHttp.code() == 400) {
try {
JSONObject jsonReader = null;
jsonReader = new JSONObject(responseHttp.body().string());
Log.d("JSON-MSG", "violations: " + jsonReader.getJSONArray("violations").getString(0));
Toast.makeText(ClientAlreadyExistConfirmation.this, "violations: " + jsonReader.getJSONArray("violations").getString(0), Toast.LENGTH_LONG).show();
} catch (JSONException e) {
e.printStackTrace();
}
}
} catch (IOException e) {
e.printStackTrace();
}
finish();
}
});
// Bouton de retour
Button button_retour = findViewById(R.id.button_non);
button_retour.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
finish();
}
});
}
}

24
app/src/main/java/com/speculos/myapplicationoc/MyApplication.java
View File

@ -1,12 +1,12 @@
package com.speculos.myapplicationoc; package com.speculos.myapplicationoc;
import android.app.Application; import android.app.Application;
public class MyApplication extends Application { public class MyApplication extends Application {
private String serverURL = "http://art-dev:8080"; private String serverURL = "http://192.168.1.72:8080";
public String getServerURL(){ public String getServerURL(){
return serverURL; return serverURL;
} }
} }

9
app/src/main/java/com/speculos/myapplicationoc/TagDetectedActivityAdmin.java
View File

@ -1,6 +1,7 @@
package com.speculos.myapplicationoc; package com.speculos.myapplicationoc;
import android.app.Activity; import android.app.Activity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.StrictMode; import android.os.StrictMode;
import android.util.Log; import android.util.Log;
@ -181,7 +182,12 @@ public class TagDetectedActivityAdmin extends Activity {
} else { } else {
// Le mail est déjà present en base // Le mail est déjà present en base
Toast.makeText(TagDetectedActivityAdmin.this, "Le mail est déjà présent en base. Souhaitez vous ajouter ce bracelet au compte: " + mail, Toast.LENGTH_LONG).show(); // TODO: rediriger vers une vue de confirmation
// Toast.makeText(TagDetectedActivityAdmin.this, "Le mail est déjà présent en base. Souhaitez vous ajouter ce bracelet au compte: " + mail, Toast.LENGTH_LONG).show();
Intent myIntent = new Intent(TagDetectedActivityAdmin.this, ClientAlreadyExistConfirmation.class);
myIntent.putExtra("hexa_id", hexa_id);
myIntent.putExtra("mail",mail);
startActivity(myIntent);
} }
@ -202,6 +208,5 @@ public class TagDetectedActivityAdmin extends Activity {
} }
}); });
} }
} }

154
app/src/main/java/com/speculos/myapplicationoc/ThreadPing.java
View File

@ -1,77 +1,77 @@
package com.speculos.myapplicationoc; package com.speculos.myapplicationoc;
import java.io.IOException; import java.io.IOException;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
public class ThreadPing extends Thread { public class ThreadPing extends Thread {
/* Ce ThreadPing n'est pas un "ping" à proprement parler /* Ce ThreadPing n'est pas un "ping" à proprement parler
* on réalise un call GET sur http://domain.dev/api * on réalise un call GET sur http://domain.dev/api
* pour savoir si le serveur répond * pour savoir si le serveur répond
* */ * */
public static Boolean isReachable; public static Boolean isReachable;
private String url; private String url;
// Constructeur // Constructeur
public ThreadPing(String url) { public ThreadPing(String url) {
this.url = url; this.url = url;
} }
private int delay = 3000; // temps entre chaque ping 5sec private int delay = 3000; // temps entre chaque ping 5sec
private PingListener listen = null; private PingListener listen = null;
public void addListener(PingListener listen) { public void addListener(PingListener listen) {
this.listen = listen; this.listen = listen;
} }
public void run() { public void run() {
while (true) { while (true) {
try { try {
String apiResponse = ""; String apiResponse = "";
try { try {
OkHttpClient client = new OkHttpClient().newBuilder() OkHttpClient client = new OkHttpClient().newBuilder()
.build(); .build();
Request request = new Request.Builder() Request request = new Request.Builder()
.url(url + "/api") .url(url + "/api")
.method("GET", null) .method("GET", null)
.build(); .build();
Response response = client.newCall(request).execute(); Response response = client.newCall(request).execute();
apiResponse = response.body().toString(); apiResponse = response.body().toString();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
if (apiResponse != "") { if (apiResponse != "") {
// Si PING OK declenche l'event ping(isReachable) // Si PING OK declenche l'event ping(isReachable)
isReachable = true; isReachable = true;
if (listen != null) listen.ping(isReachable); if (listen != null) listen.ping(isReachable);
} else { } else {
isReachable = false; isReachable = false;
if (listen != null) listen.ping(isReachable); if (listen != null) listen.ping(isReachable);
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println("Exception:" + e.getMessage()); System.out.println("Exception:" + e.getMessage());
} }
try { try {
sleep(delay); sleep(delay);
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
} }

131
app/src/main/res/layout/activity_client_exist_confirmation.xml
View File

@ -0,0 +1,131 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<TextView
android:id="@+id/textViewTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="Un compte client existe"
android:textSize="30sp"
android:textStyle="bold"/>
<TextView
android:id="@+id/textNbBracelets"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:gravity="center"
android:text="avec ? bracelets"
android:textSize="20sp"
android:textStyle="bold"/>
<Space
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/layout_mail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/label_mail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="Mail :"
android:textSize="30sp" />
<TextView
android:id="@+id/value_mail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="0.7"
android:gravity="center"
android:text="-"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_solde"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/label_solde"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="Solde :"
android:textSize="30sp" />
<TextView
android:id="@+id/value_solde"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="0.7"
android:gravity="center"
android:text="-"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="5"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingRight="20dp">
<Space
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" />
<Button
android:id="@+id/button_enregistrer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="Ajouter ce bracelet au compte" />
<Space
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5" />
<Button
android:id="@+id/button_non"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:text="retour" />
<Space
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>

12
gradle/wrapper/gradle-wrapper.properties
View File

@ -1,6 +1,6 @@
#Sun Apr 12 12:33:05 CEST 2020 #Sun Apr 12 12:33:05 CEST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

168
gradlew.bat
View File

@ -1,84 +1,84 @@
@if "%DEBUG%" == "" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@rem @rem
@rem ########################################################################## @rem ##########################################################################
@rem Set local scope for the variables with windows NT shell @rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS= set DEFAULT_JVM_OPTS=
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init if "%ERRORLEVEL%" == "0" goto init
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo location of your Java installation.
goto fail goto fail
:findJavaFromJavaHome :findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init if exist "%JAVA_EXE%" goto init
echo. echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo location of your Java installation.
goto fail goto fail
:init :init
@rem Get command-line arguments, handling Windows variants @rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args :win9xME_args
@rem Slurp the command line arguments. @rem Slurp the command line arguments.
set CMD_LINE_ARGS= set CMD_LINE_ARGS=
set _SKIP=2 set _SKIP=2
:win9xME_args_slurp :win9xME_args_slurp
if "x%~1" == "x" goto execute if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%* set CMD_LINE_ARGS=%*
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd if "%ERRORLEVEL%"=="0" goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1 exit /b 1
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal
:omega :omega

Write Preview
Loading…
Cancel
Save