From 0f5172c073daad5022409344aa25a176beaba431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 7 Feb 2012 13:27:58 +0100 Subject: Rename HelloAndroidActivity=>SameControllerActivity. --- same-android/AndroidManifest.xml | 2 +- .../main/java/com/orbekk/HelloAndroidActivity.java | 85 ---------------------- .../java/com/orbekk/SameControllerActivity.java | 85 ++++++++++++++++++++++ .../java/com/orbekk/discovery/SameService.java | 1 + 4 files changed, 87 insertions(+), 86 deletions(-) delete mode 100644 same-android/src/main/java/com/orbekk/HelloAndroidActivity.java create mode 100644 same-android/src/main/java/com/orbekk/SameControllerActivity.java diff --git a/same-android/AndroidManifest.xml b/same-android/AndroidManifest.xml index b950f44..339fb73 100644 --- a/same-android/AndroidManifest.xml +++ b/same-android/AndroidManifest.xml @@ -10,7 +10,7 @@ - + diff --git a/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java b/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java deleted file mode 100644 index 090d719..0000000 --- a/same-android/src/main/java/com/orbekk/HelloAndroidActivity.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.orbekk; - -import java.net.InetAddress; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.orbekk.discovery.Broadcaster; -import com.orbekk.discovery.SameService; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.EditText; -import android.widget.TextView; - -public class HelloAndroidActivity extends Activity { - private Logger logger = LoggerFactory.getLogger(getClass()); - - public void createNetwork(View unused) { - logger.info("Creating network"); - Intent intent = new Intent(this, SameService.class); - intent.setAction("create"); - startService(intent); - } - - public void joinNetwork(View unused) { - logger.info("Joining network"); - Intent intent = new Intent(this, SameService.class); - intent.setAction("join"); - // InetAddress address = new Broadcaster(this).getBroadcastAddress(); - EditText t = (EditText)findViewById(R.id.editText1); - intent.putExtra("masterUrl", t.getText().toString()); - startService(intent); - } - - private void showIpAddress() { - TextView t = (TextView)findViewById(R.id.ipAddress); - t.setText("My IP: "); - t.append(new Broadcaster(this).getWlanAddress().getHostAddress()); - } - - private void showBroadcastAddress() { - EditText t = (EditText)findViewById(R.id.editText1); - t.setText(new Broadcaster(this).getBroadcastAddress().getHostAddress()); - } - - /** - * Called when the activity is first created. - * @param savedInstanceState If the activity is being re-initialized after - * previously being shut down then this Bundle contains the data it most - * recently supplied in onSaveInstanceState(Bundle). Note: Otherwise it is null. - */ - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - System.setProperty("java.net.preferIPv4Stack", "true"); - System.setProperty("java.net.preferIPv6Addresses", "false"); - - setContentView(R.layout.main); - showIpAddress(); - // showBroadcastAddress(); - -// ClientApp client = new ClientApp(); -// SameInterface client_ = client.getClient(10015, "ClientNetwork", -// "http://10.0.0.6:10010/"); -// GameController controller = GameController.create( -// GameController.newPlayer(), client_); -// setContentView(new GameView(this, controller)); - -// Broadcast broadcast = new Broadcast(this); -// broadcast.sendBroadcast("Broadcast test".getBytes(), 10010); -// Broadcaster broadcaster = new Broadcaster(); -// Log.i(TAG, "Broadcast success: " + broadcaster.sendBroadcast(10010, "Broadcast test from Android".getBytes())); -// - } - - @Override - protected void onDestroy() { - super.onDestroy(); - } -} - diff --git a/same-android/src/main/java/com/orbekk/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/SameControllerActivity.java new file mode 100644 index 0000000..975a1df --- /dev/null +++ b/same-android/src/main/java/com/orbekk/SameControllerActivity.java @@ -0,0 +1,85 @@ +package com.orbekk; + +import java.net.InetAddress; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.orbekk.discovery.Broadcaster; +import com.orbekk.discovery.SameService; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.EditText; +import android.widget.TextView; + +public class SameControllerActivity extends Activity { + private Logger logger = LoggerFactory.getLogger(getClass()); + + public void createNetwork(View unused) { + logger.info("Creating network"); + Intent intent = new Intent(this, SameService.class); + intent.setAction("create"); + startService(intent); + } + + public void joinNetwork(View unused) { + logger.info("Joining network"); + Intent intent = new Intent(this, SameService.class); + intent.setAction("join"); + // InetAddress address = new Broadcaster(this).getBroadcastAddress(); + EditText t = (EditText)findViewById(R.id.editText1); + intent.putExtra("masterUrl", t.getText().toString()); + startService(intent); + } + + private void showIpAddress() { + TextView t = (TextView)findViewById(R.id.ipAddress); + t.setText("My IP: "); + t.append(new Broadcaster(this).getWlanAddress().getHostAddress()); + } + + private void showBroadcastAddress() { + EditText t = (EditText)findViewById(R.id.editText1); + t.setText(new Broadcaster(this).getBroadcastAddress().getHostAddress()); + } + + /** + * Called when the activity is first created. + * @param savedInstanceState If the activity is being re-initialized after + * previously being shut down then this Bundle contains the data it most + * recently supplied in onSaveInstanceState(Bundle). Note: Otherwise it is null. + */ + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + System.setProperty("java.net.preferIPv4Stack", "true"); + System.setProperty("java.net.preferIPv6Addresses", "false"); + + setContentView(R.layout.main); + showIpAddress(); + // showBroadcastAddress(); + +// ClientApp client = new ClientApp(); +// SameInterface client_ = client.getClient(10015, "ClientNetwork", +// "http://10.0.0.6:10010/"); +// GameController controller = GameController.create( +// GameController.newPlayer(), client_); +// setContentView(new GameView(this, controller)); + +// Broadcast broadcast = new Broadcast(this); +// broadcast.sendBroadcast("Broadcast test".getBytes(), 10010); +// Broadcaster broadcaster = new Broadcaster(); +// Log.i(TAG, "Broadcast success: " + broadcaster.sendBroadcast(10010, "Broadcast test from Android".getBytes())); +// + } + + @Override + protected void onDestroy() { + super.onDestroy(); + } +} + diff --git a/same-android/src/main/java/com/orbekk/discovery/SameService.java b/same-android/src/main/java/com/orbekk/discovery/SameService.java index 900c7c8..44f0013 100644 --- a/same-android/src/main/java/com/orbekk/discovery/SameService.java +++ b/same-android/src/main/java/com/orbekk/discovery/SameService.java @@ -80,6 +80,7 @@ public class SameService extends Service { discoveryThread = new DiscoveryThread(sameController.getClient()); discoveryThread.start(); } + } } -- cgit v1.2.3