Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Application-Android-IUT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sofiane Lasri
Application-Android-IUT
Commits
bb9b091f
Commit
bb9b091f
authored
3 years ago
by
Sofiane Lasri
Browse files
Options
Downloads
Patches
Plain Diff
Meilleure gestion des commandes reçues
parent
ba6ce6df
Branches
main
No related tags found
No related merge requests found
Pipeline
#20
failed
2 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/com/slprojects/pizzeria/backTasks.java
+36
-18
36 additions, 18 deletions
app/src/main/java/com/slprojects/pizzeria/backTasks.java
app/src/main/res/layout/activity_num_table.xml
+7
-6
7 additions, 6 deletions
app/src/main/res/layout/activity_num_table.xml
with
43 additions
and
24 deletions
app/src/main/java/com/slprojects/pizzeria/backTasks.java
+
36
−
18
View file @
bb9b091f
...
@@ -41,27 +41,45 @@ public class backTasks extends AsyncTask<String, Void, Void> {
...
@@ -41,27 +41,45 @@ public class backTasks extends AsyncTask<String, Void, Void> {
// Le serveur demande d'envoyer LIST pour la récupérer
// Le serveur demande d'envoyer LIST pour la récupérer
sendMessageToServer
(
"LIST"
);
sendMessageToServer
(
"LIST"
);
// On va récupérer le nombre de commandes
// On va récupérer les messages du serveur
Integer
nbCommandes
=
Integer
.
parseInt
(
input
.
readLine
());
Integer
nbMessagesRecus
=
0
;
Log
.
i
(
"backTasks:"
,
"Nombre de commandes: "
+
nbCommandes
);
Integer
nbMessagesAttendus
=
0
;
Boolean
listenMessages
=
true
;
// Maintenant on va attendre ses messages
String
receivedMessage
=
""
;
String
receviedMsg
=
""
;
String
messageToSend
=
""
;
Integer
receivedFlag
=
1
;
// On va écouter un message tant que le flag est vrai
String
textToDisplay
=
""
;
while
(
listenMessages
){
// Je ne peux pas faire receivedFlag < nbCommandes car il y a des commandes regroupées sur une seule ligne
receivedMessage
=
input
.
readLine
();
// On lit le message
while
(
receviedMsg
!=
null
||
receivedFlag
==
1
){
if
(
receivedMessage
!=
null
){
// Si on a bien reçu un message
receviedMsg
=
input
.
readLine
();
// On va check l'ordre du message
if
(
receviedMsg
!=
null
){
// Le premier message contient le nombre de commandes
textToDisplay
+=
receviedMsg
+
"\n"
;
if
(
nbMessagesRecus
==
0
){
Log
.
i
(
"backTasks"
,
"Commande en attente: "
+
receviedMsg
);
nbMessagesAttendus
=
Integer
.
parseInt
(
receivedMessage
);
receivedFlag
++;
// On incrémente le flag
nbMessagesRecus
++;
Log
.
i
(
"backTasks"
,
"Flag: "
+
receivedFlag
);
Log
.
i
(
"backTasks:"
,
"Nombre de commandes: "
+
nbMessagesAttendus
);
}
else
{
// On a reçu un message
// On va split les messages au cas où plusieurs auraient été envoyés en même temps
String
[]
messages
=
receivedMessage
.
split
(
"Table"
);
for
(
int
i
=
0
;
i
<
messages
.
length
;
i
++){
if
(
messages
[
i
].
length
()
>
0
){
// On ajoute le message à la liste
messageToSend
+=
"Table"
+
messages
[
i
]
+
"\n"
;
// On rajoute "Table" car le split l'a supprimé
// On va incrémenter le nombre de message reçu
nbMessagesRecus
++;
Log
.
i
(
"backTasks:"
,
"Message n°"
+
nbMessagesRecus
+
" reçu: "
+
messages
[
i
]);
}
}
}
}
Log
.
i
(
"backTasks"
,
"Liste des commandes reçues"
);
}
if
((
nbMessagesRecus
-
1
)
==
nbMessagesAttendus
){
// -1 car on a déjà récupéré le nombre de commandes
// On a reçu tous les messages
listenMessages
=
false
;
}
}
}
// On va afficher les commandes
// On va afficher les commandes
numTableActivity
.
setListeCommandes
(
textToDisplay
);
numTableActivity
.
setListeCommandes
(
messageToSend
);
}
else
{
}
else
{
if
(
activity
==
null
){
if
(
activity
==
null
){
...
...
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/activity_num_table.xml
+
7
−
6
View file @
bb9b091f
...
@@ -23,10 +23,10 @@
...
@@ -23,10 +23,10 @@
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
android:orientation=
"horizontal"
app:layout_constraintTop_toBottomOf=
"@+id/imageView"
app:layout_constraintBottom_toTopOf=
"@+id/listeCommandesText"
app:layout_constraintBottom_toTopOf=
"@+id/listeCommandesText"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraint
End_toEndOf=
"parent
"
>
app:layout_constraint
Top_toBottomOf=
"@+id/imageView
"
>
<TextView
<TextView
android:id=
"@+id/textNumTable"
android:id=
"@+id/textNumTable"
...
@@ -39,8 +39,9 @@
...
@@ -39,8 +39,9 @@
android:id=
"@+id/tableNumInput"
android:id=
"@+id/tableNumInput"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:ems=
"10"
android:ems=
"9"
android:inputType=
"number"
/>
android:inputType=
"number"
android:minHeight=
"48dp"
/>
<Button
<Button
android:id=
"@+id/btnValider"
android:id=
"@+id/btnValider"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment