From 6bafaf1e177a08b58b1b53b85e9e5db5dc6494fc Mon Sep 17 00:00:00 2001
From: Aylen Ricca <aricca@fing.edu.uy>
Date: Wed, 23 Jul 2014 09:33:01 -0300
Subject: [PATCH] getting ip dialog
---
.../edu/chesstrack/communication/Server.java | 11 ++++-
.../fing/chesstrack/ChessTrackActivity.java | 41 ++++++++++++++++++-
2 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Server.java b/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Server.java
index 6d37c12..778cf9c 100644
--- a/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Server.java
+++ b/ProyectoAndroid/ChessTrack/src/uy/edu/chesstrack/communication/Server.java
@@ -27,7 +27,7 @@ public class Server {
public static final int SERVERPORT = 5555;
- public Server() {
+ public Server(String serverIp) {
clientSocket = null;
try {
serverSocket = new ServerSocket(SERVERPORT);
@@ -44,6 +44,15 @@ public class Server {
}
}
+ public void SendData() {
+ try {
+ serverSocket.close();
+ clientSocket.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
public void Stop() {
try {
serverSocket.close();
diff --git a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ChessTrackActivity.java b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ChessTrackActivity.java
index b401fcd..5de3f1e 100644
--- a/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ChessTrackActivity.java
+++ b/ProyectoAndroid/ChessTrack/src/uy/edu/fing/chesstrack/ChessTrackActivity.java
@@ -8,18 +8,27 @@ import org.opencv.android.LoaderCallbackInterface;
import org.opencv.android.OpenCVLoader;
import org.opencv.core.Mat;
+import uy.edu.chesstrack.communication.Server;
import uy.edu.fing.chesstrack.modulovision.Adquisicion;
import uy.edu.fing.chesstrack.modulovision.Calibracion;
import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
import android.media.AudioManager;
import android.media.ToneGenerator;
import android.os.Bundle;
+import android.text.Editable;
+import android.text.method.KeyListener;
import android.util.Log;
+import android.view.KeyEvent;
import android.view.SurfaceView;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.WindowManager;
import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
public class ChessTrackActivity extends Activity implements CvCameraViewListener {
@@ -30,6 +39,8 @@ public class ChessTrackActivity extends Activity implements CvCameraViewListener
private Adquisicion adq;
private Calibracion calibrar;
private Button btnCalibrar;
+ private Server ServidorCommunication;
+ private EditText text;
//TODO es chancho pero ver luego
private Mat frame;
@@ -71,7 +82,6 @@ public class ChessTrackActivity extends Activity implements CvCameraViewListener
mOpenCvCameraView.setVisibility(SurfaceView.VISIBLE);
mOpenCvCameraView.setCvCameraViewListener(this);
try {
-
isUsed = false;
isCalibrada =false;
addListenerOnButton();
@@ -80,8 +90,35 @@ public class ChessTrackActivity extends Activity implements CvCameraViewListener
e.printStackTrace();
}
+ getIp();
}
+ public void getIp(){
+ AlertDialog.Builder alert = new AlertDialog.Builder(this);
+ alert.setTitle("Communication Setup");
+ alert.setMessage("Set server ip");
+
+ // Set an EditText view to get user input
+ final EditText input = new EditText(this);
+ alert.setView(input);
+
+ alert.setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int whichButton) {
+ Editable value = input.getText();
+ Log.i(TAG,"INPUT=" + value.toString());
+ ServidorCommunication = new Server(value.toString());
+ }
+ });
+
+ alert.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int whichButton) {
+ // no server communication
+ }
+ });
+
+ alert.show();
+ }
+
public void addListenerOnButton() {
btnCalibrar = (Button) findViewById(R.id.btn_calibrar);
@@ -111,7 +148,6 @@ public class ChessTrackActivity extends Activity implements CvCameraViewListener
}
});
-
}
@@ -130,6 +166,7 @@ public class ChessTrackActivity extends Activity implements CvCameraViewListener
if (mOpenCvCameraView != null) {
mOpenCvCameraView.disableView();
}
+ this.ServidorCommunication.Stop();
}
@Override
--
GitLab