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
ba4d9483
Commit
ba4d9483
authored
3 years ago
by
Sofiane Lasri
Browse files
Options
Downloads
Patches
Plain Diff
Fix by C.Keller
parent
4bfc42e8
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/com/slprojects/pizzeria/MainActivity.java
+4
-3
4 additions, 3 deletions
app/src/main/java/com/slprojects/pizzeria/MainActivity.java
app/src/main/java/com/slprojects/pizzeria/backTasks.java
+9
-4
9 additions, 4 deletions
app/src/main/java/com/slprojects/pizzeria/backTasks.java
with
13 additions
and
7 deletions
app/src/main/java/com/slprojects/pizzeria/MainActivity.java
+
4
−
3
View file @
ba4d9483
...
@@ -71,8 +71,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
...
@@ -71,8 +71,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
// On réserve les espaces pour les commandes
// On réserve les espaces pour les commandes
boutons
.
forEach
((
btn
)
->
numCommands
.
add
(
idIndexes
.
indexOf
(
btn
.
getId
()),
0
));
boutons
.
forEach
((
btn
)
->
numCommands
.
add
(
idIndexes
.
indexOf
(
btn
.
getId
()),
0
));
}
}
tacheDeFond
=
new
backTasks
();
tacheDeFond
.
execute
();
}
}
@Override
@Override
...
@@ -87,8 +85,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
...
@@ -87,8 +85,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
numCommands
.
set
(
idIndexes
.
indexOf
(
v
.
getId
()),
numCommands
.
get
(
idIndexes
.
indexOf
(
v
.
getId
()))+
1
);
numCommands
.
set
(
idIndexes
.
indexOf
(
v
.
getId
()),
numCommands
.
get
(
idIndexes
.
indexOf
(
v
.
getId
()))+
1
);
setButtonText
(
bouton
);
setButtonText
(
bouton
);
String
message
=
numTable
+
nomBoutons
.
get
(
idIndexes
.
indexOf
(
v
.
getId
()));
tacheDeFond
=
new
backTasks
();
tacheDeFond
.
execute
(
message
);
// Envoie de la commande
// Envoie de la commande
tacheDeFond
.
registerCommand
(
numTable
+
nomBoutons
.
get
(
idIndexes
.
indexOf
(
v
.
getId
())));
//
tacheDeFond.registerCommand(numTable+nomBoutons.get(idIndexes.indexOf(v.getId())));
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
Log
.
e
(
"Erreur"
,
e
.
getMessage
());
Log
.
e
(
"Erreur"
,
e
.
getMessage
());
}
}
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/com/slprojects/pizzeria/backTasks.java
+
9
−
4
View file @
ba4d9483
...
@@ -9,31 +9,35 @@ import java.io.PrintWriter;
...
@@ -9,31 +9,35 @@ import java.io.PrintWriter;
import
java.net.InetAddress
;
import
java.net.InetAddress
;
import
java.net.Socket
;
import
java.net.Socket
;
public
class
backTasks
extends
AsyncTask
{
public
class
backTasks
extends
AsyncTask
<
String
,
Void
,
Void
>
{
private
Socket
socket
;
private
Socket
socket
;
private
PrintWriter
output
;
private
PrintWriter
output
;
private
BufferedReader
input
;
private
BufferedReader
input
;
@Override
@Override
protected
Object
doInBackground
(
Object
[]
objects
)
{
protected
Void
doInBackground
(
String
...
message
)
{
int
serverPort
=
9874
;
int
serverPort
=
9874
;
String
address
=
"chadok.info"
;
String
address
=
"chadok.info"
;
try
{
try
{
InetAddress
ipAddress
=
InetAddress
.
getByName
(
address
);
//
InetAddress ipAddress = InetAddress.getByName(address);
Log
.
i
(
"backTasks:"
,
"Connecting to "
+
address
+
":"
+
serverPort
+
"..."
);
Log
.
i
(
"backTasks:"
,
"Connecting to "
+
address
+
":"
+
serverPort
+
"..."
);
socket
=
new
Socket
(
ipA
ddress
,
serverPort
);
socket
=
new
Socket
(
a
ddress
,
serverPort
);
Log
.
i
(
"backTasks:"
,
"Connected"
);
Log
.
i
(
"backTasks:"
,
"Connected"
);
output
=
new
PrintWriter
(
socket
.
getOutputStream
(),
true
);
output
=
new
PrintWriter
(
socket
.
getOutputStream
(),
true
);
input
=
new
BufferedReader
(
new
InputStreamReader
(
socket
.
getInputStream
()));
input
=
new
BufferedReader
(
new
InputStreamReader
(
socket
.
getInputStream
()));
registerCommand
(
message
[
0
]);
/*
while(true){
while(true){
String message = input.readLine();
String message = input.readLine();
if (message != null){
if (message != null){
Log.i("backTasks", "received message: " + message);
Log.i("backTasks", "received message: " + message);
}
}
}
}
*/
}
catch
(
Exception
x
)
{
}
catch
(
Exception
x
)
{
x
.
printStackTrace
();
x
.
printStackTrace
();
...
@@ -45,6 +49,7 @@ public class backTasks extends AsyncTask {
...
@@ -45,6 +49,7 @@ public class backTasks extends AsyncTask {
if
(
output
!=
null
){
if
(
output
!=
null
){
Log
.
i
(
"backTasks"
,
"registered command: "
+
command
);
Log
.
i
(
"backTasks"
,
"registered command: "
+
command
);
output
.
write
(
command
);
output
.
write
(
command
);
output
.
flush
();
}
}
}
}
...
...
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