|
From: <jan...@us...> - 2010-03-22 15:53:59
|
Revision: 727
http://swingme.svn.sourceforge.net/swingme/?rev=727&view=rev
Author: janeroski
Date: 2010-03-22 15:53:50 +0000 (Mon, 22 Mar 2010)
Log Message:
-----------
android source
Added Paths:
-----------
AndroidME/src_Android/
AndroidME/src_Android/net/
AndroidME/src_Android/net/yura/
AndroidME/src_Android/net/yura/android/
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
AndroidME/src_Android/net/yura/android/io/
AndroidME/src_Android/net/yura/android/io/AndroidURLConnection.java
AndroidME/src_Android/net/yura/android/io/file/
AndroidME/src_Android/net/yura/android/io/file/AndroidFileConnection.java
AndroidME/src_Android/net/yura/android/io/socket/
AndroidME/src_Android/net/yura/android/io/socket/ServerSocketConnection.java
AndroidME/src_Android/net/yura/android/io/socket/SocketConnection.java
AndroidME/src_Android/net/yura/android/lcdui/
AndroidME/src_Android/net/yura/android/lcdui/FontManager.java
AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java
AndroidME/src_Android/net/yura/android/log/
AndroidME/src_Android/net/yura/android/log/LogOutputStream.java
AndroidME/src_Android/net/yura/android/pim/
AndroidME/src_Android/net/yura/android/pim/AndroidContactList.java
AndroidME/src_Android/net/yura/android/pim/AndroidPIMItem.java
AndroidME/src_Android/net/yura/android/pim/AndroidPIMList.java
AndroidME/src_Android/net/yura/android/pim/PreloadingAndroidPIMItem.java
AndroidME/src_Android/net/yura/android/rms/
AndroidME/src_Android/net/yura/android/rms/RecordEnumerationImpl.java
AndroidME/src_JSR120_SMS/
AndroidME/src_JSR120_SMS/javax/
AndroidME/src_JSR120_SMS/javax/wireless/
AndroidME/src_JSR120_SMS/javax/wireless/messaging/
AndroidME/src_JSR120_SMS/javax/wireless/messaging/BinaryMessage.java
AndroidME/src_JSR120_SMS/javax/wireless/messaging/Message.java
AndroidME/src_JSR120_SMS/javax/wireless/messaging/MessageConnection.java
AndroidME/src_JSR120_SMS/javax/wireless/messaging/MessageListener.java
AndroidME/src_JSR120_SMS/javax/wireless/messaging/TextMessage.java
AndroidME/src_JSR135_Multimedia/
AndroidME/src_JSR135_Multimedia/javax/
AndroidME/src_JSR135_Multimedia/javax/microedition/
AndroidME/src_JSR135_Multimedia/javax/microedition/media/
AndroidME/src_JSR135_Multimedia/javax/microedition/media/TimeBase.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/FramePositioningControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/GUIControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/MIDIControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/MetaDataControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/PitchControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/RateControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/RecordControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/StopTimeControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/TempoControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/control/VideoControl.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/protocol/
AndroidME/src_JSR135_Multimedia/javax/microedition/media/protocol/ContentDescriptor.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/protocol/DataSource.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/protocol/SourceStream.java
AndroidME/src_JSR179_Location/
AndroidME/src_JSR179_Location/javax/
AndroidME/src_JSR179_Location/javax/microedition/
AndroidME/src_JSR179_Location/javax/microedition/location/
AndroidME/src_JSR179_Location/javax/microedition/location/Coordinates.java
AndroidME/src_JSR179_Location/javax/microedition/location/Criteria.java
AndroidME/src_JSR179_Location/javax/microedition/location/Location.java
AndroidME/src_JSR179_Location/javax/microedition/location/LocationException.java
AndroidME/src_JSR179_Location/javax/microedition/location/LocationProvider.java
AndroidME/src_JSR179_Location/javax/microedition/location/QualifiedCoordinates.java
AndroidME/src_JSR184_3D/
AndroidME/src_JSR184_3D/javax/
AndroidME/src_JSR184_3D/javax/microedition/
AndroidME/src_JSR184_3D/javax/microedition/m3g/
AndroidME/src_JSR184_3D/javax/microedition/m3g/Appearance.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Background.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Camera.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/CompositingMode.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Fog.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Graphics3D.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Group.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Image2D.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/IndexBuffer.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Light.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Loader.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Material.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Mesh.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Node.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Object3D.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/PolygonMode.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/RenderEventListener.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Sprite3D.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Texture2D.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Transform.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/Transformable.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/TriangleStripArray.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/VertexArray.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/VertexBuffer.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/World.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/util/
AndroidME/src_JSR184_3D/javax/microedition/m3g/util/Color.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/util/Reflection.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/util/ResourceRetriever.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/vecMath/
AndroidME/src_JSR184_3D/javax/microedition/m3g/vecMath/Constants.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/vecMath/Vector2.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/vecMath/Vector3.java
AndroidME/src_JSR184_3D/javax/microedition/m3g/vecMath/Vector4.java
AndroidME/src_JSR82_Bluetooth/
AndroidME/src_JSR82_Bluetooth/javax/
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/BluetoothConnectionException.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/BluetoothStateException.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/DataElement.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/DeviceClass.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/DiscoveryAgent.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/DiscoveryListener.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/L2CAPConnection.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/L2CAPConnectionNotifier.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/RemoteDevice.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/ServiceRecord.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/ServiceRegistrationException.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/UUID.java
AndroidME/src_JSR82_Bluetooth/javax/obex/
AndroidME/src_JSR82_Bluetooth/javax/obex/Authenticator.java
AndroidME/src_JSR82_Bluetooth/javax/obex/ClientSession.java
AndroidME/src_JSR82_Bluetooth/javax/obex/HeaderSet.java
AndroidME/src_JSR82_Bluetooth/javax/obex/Operation.java
AndroidME/src_JSR82_Bluetooth/javax/obex/PasswordAuthentication.java
AndroidME/src_JSR82_Bluetooth/javax/obex/ResponseCodes.java
AndroidME/src_JSR82_Bluetooth/javax/obex/ServerRequestHandler.java
AndroidME/src_JSR82_Bluetooth/javax/obex/SessionNotifier.java
AndroidME/src_MIDP/
AndroidME/src_MIDP/javax/
AndroidME/src_MIDP/javax/microedition/
AndroidME/src_MIDP/javax/microedition/io/
AndroidME/src_MIDP/javax/microedition/io/Connection.java
AndroidME/src_MIDP/javax/microedition/io/ConnectionNotFoundException.java
AndroidME/src_MIDP/javax/microedition/io/Connector.java
AndroidME/src_MIDP/javax/microedition/io/ContentConnection.java
AndroidME/src_MIDP/javax/microedition/io/HttpConnection.java
AndroidME/src_MIDP/javax/microedition/io/InputConnection.java
AndroidME/src_MIDP/javax/microedition/io/OutputConnection.java
AndroidME/src_MIDP/javax/microedition/io/ServerSocketConnection.java
AndroidME/src_MIDP/javax/microedition/io/SocketConnection.java
AndroidME/src_MIDP/javax/microedition/io/StreamConnection.java
AndroidME/src_MIDP/javax/microedition/io/StreamConnectionNotifier.java
AndroidME/src_MIDP/javax/microedition/io/file/
AndroidME/src_MIDP/javax/microedition/io/file/FileConnection.java
AndroidME/src_MIDP/javax/microedition/io/file/FileSystemListener.java
AndroidME/src_MIDP/javax/microedition/io/file/FileSystemRegistry.java
AndroidME/src_MIDP/javax/microedition/lcdui/
AndroidME/src_MIDP/javax/microedition/lcdui/AlertType.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
AndroidME/src_MIDP/javax/microedition/lcdui/Command.java
AndroidME/src_MIDP/javax/microedition/lcdui/CommandListener.java
AndroidME/src_MIDP/javax/microedition/lcdui/Display.java
AndroidME/src_MIDP/javax/microedition/lcdui/Displayable.java
AndroidME/src_MIDP/javax/microedition/lcdui/Font.java
AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
AndroidME/src_MIDP/javax/microedition/lcdui/Screen.java
AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
AndroidME/src_MIDP/javax/microedition/lcdui/TextField.java
AndroidME/src_MIDP/javax/microedition/lcdui/game/
AndroidME/src_MIDP/javax/microedition/lcdui/game/GameCanvas.java
AndroidME/src_MIDP/javax/microedition/lcdui/game/Layer.java
AndroidME/src_MIDP/javax/microedition/lcdui/game/Sprite.java
AndroidME/src_MIDP/javax/microedition/media/
AndroidME/src_MIDP/javax/microedition/media/Control.java
AndroidME/src_MIDP/javax/microedition/media/Controllable.java
AndroidME/src_MIDP/javax/microedition/media/Manager.java
AndroidME/src_MIDP/javax/microedition/media/MediaException.java
AndroidME/src_MIDP/javax/microedition/media/Player.java
AndroidME/src_MIDP/javax/microedition/media/PlayerListener.java
AndroidME/src_MIDP/javax/microedition/media/TonePlayer.java
AndroidME/src_MIDP/javax/microedition/media/control/
AndroidME/src_MIDP/javax/microedition/media/control/ToneControl.java
AndroidME/src_MIDP/javax/microedition/media/control/VolumeControl.java
AndroidME/src_MIDP/javax/microedition/midlet/
AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
AndroidME/src_MIDP/javax/microedition/midlet/MIDletStateChangeException.java
AndroidME/src_MIDP/javax/microedition/pim/
AndroidME/src_MIDP/javax/microedition/pim/Contact.java
AndroidME/src_MIDP/javax/microedition/pim/ContactList.java
AndroidME/src_MIDP/javax/microedition/pim/PIM.java
AndroidME/src_MIDP/javax/microedition/pim/PIMException.java
AndroidME/src_MIDP/javax/microedition/pim/PIMItem.java
AndroidME/src_MIDP/javax/microedition/pim/PIMList.java
AndroidME/src_MIDP/javax/microedition/rms/
AndroidME/src_MIDP/javax/microedition/rms/InvalidRecordIDException.java
AndroidME/src_MIDP/javax/microedition/rms/RecordComparator.java
AndroidME/src_MIDP/javax/microedition/rms/RecordEnumeration.java
AndroidME/src_MIDP/javax/microedition/rms/RecordFilter.java
AndroidME/src_MIDP/javax/microedition/rms/RecordListener.java
AndroidME/src_MIDP/javax/microedition/rms/RecordStore.java
AndroidME/src_MIDP/javax/microedition/rms/RecordStoreException.java
AndroidME/src_MIDP/javax/microedition/rms/RecordStoreFullException.java
AndroidME/src_MIDP/javax/microedition/rms/RecordStoreNotFoundException.java
AndroidME/src_MIDP/javax/microedition/rms/RecordStoreNotOpenException.java
Added: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-03-22 15:53:50 UTC (rev 727)
@@ -0,0 +1,362 @@
+package net.yura.android;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.lang.reflect.Field;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Vector;
+
+import javax.microedition.lcdui.Command;
+import javax.microedition.lcdui.CommandListener;
+import javax.microedition.lcdui.Display;
+import javax.microedition.lcdui.Displayable;
+import javax.microedition.midlet.MIDlet;
+
+import net.yura.android.lcdui.Toolkit;
+import net.yura.android.log.LogOutputStream;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnKeyListener;
+
+public class AndroidMeMIDlet extends Activity implements Toolkit {
+ private static final String MIDLET_PROPERTY = "midlet";
+
+ private MIDlet midlet;
+ private View defaultView;
+ private Handler handler;
+ private Thread eventThread;
+ private Object lock = new Object();
+
+ public static AndroidMeMIDlet DEFAULT_ACTIVITY;
+
+ public AndroidMeMIDlet() {
+ DEFAULT_ACTIVITY = this;
+ }
+
+ public MIDlet getMIDlet() {
+ return this.midlet;
+ }
+
+ public Handler getHandler() {
+ return handler;
+ }
+
+ public void invokeAndWait(final Runnable runnable) {
+ if (Thread.currentThread() == this.eventThread) {
+ runnable.run();
+ } else {
+ Runnable r = new Runnable() {
+ public void run() {
+ synchronized (AndroidMeMIDlet.this.lock) {
+ runnable.run();
+ AndroidMeMIDlet.this.lock.notify();
+ }
+ }
+ };
+ synchronized (this.lock) {
+ this.handler.post(r);
+ try {
+ this.lock.wait();
+ } catch (InterruptedException ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Override
+ protected void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ this.handler = new Handler();
+ this.eventThread = Thread.currentThread();
+
+ View splash = this.getLayoutInflater().inflate(R.layout.main, null, false);
+ this.defaultView = splash;
+ setContentView(splash);
+
+// PrintStream log = new PrintStream(new LogOutputStream("AndroidMe"));
+// System.setErr(log);
+// System.setOut(log);
+ }
+
+ private MIDlet createMIDlet() {
+ System.setProperty("microedition.platform", "microemulator-android");
+ System.setProperty("microedition.locale", Locale.getDefault().toString());
+ System.setProperty("microedition.configuration", "CLDC-1.1");
+ System.setProperty("microedition.profiles", "MIDP-2.0");
+
+ Properties properties = new Properties();
+
+ try {
+ InputStream is = getAssets().open("BadooMobile.jad");
+ properties.load(is);
+
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+
+ System.out.println(">>>1 " + System.getProperty("microedition.platform"));
+
+ // create a new class loader that correctly handles getResourceAsStream!
+
+
+ properties.put(MIDLET_PROPERTY, "net.yura.mobile.test.MyMidlet");
+ // properties.put(MIDLET_PROPERTY, "com.badoo.locator.BadooMidlet");
+
+// System.out.println(">>> " + net.java.dev.lwuit.speed.SpeedMIDlet.class);
+// properties.put(MIDLET_PROPERTY, "net.java.dev.lwuit.speed.SpeedMIDlet");
+
+ String midletClassName = properties.getProperty(MIDLET_PROPERTY);
+ ClassLoader classLoader;
+ classLoader = this.getClassLoader();
+ MIDlet midlet;
+ MIDlet.DEFAULT_ACTIVITY = this;
+ MIDlet.DEFAULT_TOOLKIT = this;
+ MIDlet.DEFAULT_APPLICATION_PROPERTIES = properties;
+ try {
+ Class midletClass = Class.forName(midletClassName, true, classLoader);
+ midlet = (MIDlet) midletClass.newInstance();
+ } catch (Exception ex) {
+ throw new RuntimeException("unable to load class "
+ + midletClassName, ex);
+ }
+ return midlet;
+ }
+
+ @Override
+ protected void onDestroy() {
+ try {
+ if (this.midlet != null) {
+ this.midlet.doDestroyApp(true);
+ this.midlet = null;
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException("unable to destroy", ex);
+ }
+ // this.resources.getAssets().release();
+ super.onDestroy();
+ }
+
+ @Override
+ protected void onPause() {
+ try {
+ if (this.midlet != null) {
+ this.midlet.doPauseApp();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw new RuntimeException("unable to freeze app", ex);
+ }
+ super.onPause();
+ }
+
+ @Override
+ public void onStop() {
+ // TODO: JP
+ onDestroy();
+ }
+
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+
+ if (this.midlet == null) {
+ Thread thread = new Thread() {
+ public void run() {
+ while (defaultView.getWidth() == 0) {
+ try {
+ Thread.sleep(500);
+ System.out.println("W:" + defaultView.getWidth()
+ + ",H:" + defaultView.getHeight() + ",MW:"
+ + defaultView.getMeasuredWidth() + ",MH:"
+ + defaultView.getMeasuredHeight());
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ MIDlet midlet = createMIDlet();
+ AndroidMeMIDlet.this.midlet = midlet;
+ try {
+ if (midlet != null) {
+ midlet.doStartApp();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ };
+ thread.start();
+ } else {
+ try {
+ this.midlet.doStartApp();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw new RuntimeException("couldn't start MIDlet");
+ }
+ }
+
+ }
+
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+
+ boolean result = false;
+ Display display = Display.getDisplay(midlet);
+ Displayable current = display.getCurrent();
+ if (current != null) {
+ // load the menu items
+ menu.clear();
+ Vector<Command> commands = current.getCommands();
+ for (int i = 0; i < commands.size(); i++) {
+ result = true;
+ Command cmd = commands.get(i);
+ if (cmd.getCommandType() != Command.BACK && cmd.getCommandType() != Command.EXIT) {
+ menu.addSubMenu(Menu.NONE, i + Menu.FIRST, Menu.NONE, cmd.getLabel());
+ }
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ Display display = Display.getDisplay(midlet);
+ Displayable current = display.getCurrent();
+ if (current != null) {
+ Vector<Command> commands = current.getCommands();
+
+ int commandIndex = item.getItemId() - Menu.FIRST;
+ Command c = commands.get(commandIndex);
+ CommandListener l = current.getCommandListener();
+
+ if (c != null && l != null) {
+ l.commandAction(c, current);
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+// @Override
+// public boolean onCreateOptionsMenu(Menu menu) {
+// if (this.midlet != null) {
+// this.midlet.setMenu(menu);
+// } else {
+// this.menu = menu;
+// }
+// return super.onCreateOptionsMenu(menu);
+// }
+
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
+
+ Displayable displayable = Display.getDisplay(this.midlet).getCurrent();
+
+ if (keyCode == KeyEvent.KEYCODE_BACK) {
+ // we need to see if there is a back option in the current display
+ for (Command c : displayable.getCommands()) {
+ if (c.getCommandType() == Command.BACK) {
+ // manually call the back operation: YECH!
+ displayable.getCommandListener().commandAction(c,
+ displayable);
+ return true;
+ }
+ }
+ }
+
+ if (displayable instanceof OnKeyListener) {
+ OnKeyListener keyListener = (OnKeyListener) displayable;
+ keyListener.onKey(null, keyCode, event);
+ }
+
+ return super.onKeyDown(keyCode, event);
+ }
+
+ public int getResourceId(String resourceName) {
+ // slow, slow, slow (cache?)
+ // mmmmm, introspection
+ String[] splits = resourceName.split("\\.");
+ Class c = R.class;
+ for (int i = 0; i < splits.length; i++) {
+ String name = splits[i];
+ if (i < splits.length - 1) {
+ Class[] childClasses = c.getDeclaredClasses();
+ Class found = null;
+ for (int j = 0; j < childClasses.length; j++) {
+ Class childClass = childClasses[j];
+ String separator;
+
+ if (childClass.getName().endsWith("$" + name)) {
+ found = childClass;
+ break;
+ }
+ }
+ if (found == null) {
+ throw new RuntimeException("no class " + resourceName + "("
+ + name + ") in " + c.getName());
+ } else {
+ c = found;
+ }
+ } else {
+ try {
+ Field field = c.getField(name);
+ return field.getInt(null);
+ } catch (Exception ex) {
+ throw new RuntimeException("no field " + name + " in "
+ + c.getName());
+ }
+ }
+ }
+ throw new RuntimeException("no resource " + resourceName);
+ }
+
+ public int getScreenHeight() {
+ return this.defaultView.getHeight();
+ }
+
+ public int getScreenWidth() {
+ return this.defaultView.getWidth();
+ }
+
+ public View inflate(int resourceId) {
+ return this.getLayoutInflater().inflate(resourceId, null, false);
+ }
+
+ public static InputStream getResourceAsStream(Class origClass, String name)
+ throws IOException {
+
+ long time = System.currentTimeMillis();
+ System.out.println(">>> getResourceAsStream (" + origClass.getName() + ")" + name);
+ long time2 = System.currentTimeMillis() - time;
+
+ InputStream is = null;
+ try {
+ if (name.startsWith("/")) {
+ name = name.substring(1);
+ }
+
+ is = DEFAULT_ACTIVITY.getAssets().open(name);
+ } catch (Throwable e) {
+ // e.printStackTrace();
+ }
+
+ if (is == null) {
+ long elapsed = System.currentTimeMillis() - time;
+ System.out.println(">>> getResourceAsStream: NOT FOUND. " + time2 + " " + elapsed);
+ }
+
+ return is;
+ }
+
+}
Added: AndroidME/src_Android/net/yura/android/io/AndroidURLConnection.java
===================================================================
--- AndroidME/src_Android/net/yura/android/io/AndroidURLConnection.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/io/AndroidURLConnection.java 2010-03-22 15:53:50 UTC (rev 727)
@@ -0,0 +1,61 @@
+package net.yura.android.io;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
+import javax.microedition.io.Connection;
+import javax.microedition.io.InputConnection;
+import javax.microedition.io.OutputConnection;
+import javax.microedition.io.StreamConnection;
+
+public class AndroidURLConnection implements StreamConnection,
+ OutputConnection, InputConnection, Connection {
+
+ protected URLConnection connection;
+
+ public AndroidURLConnection( String url )
+ throws MalformedURLException, IOException{
+ this( new URL( url ) );
+ }
+
+ public AndroidURLConnection( URL url )
+ throws IOException {
+ this( url.openConnection() );
+ }
+
+ public AndroidURLConnection( URLConnection connection ) {
+
+ }
+
+ // @Override
+ public DataInputStream openDataInputStream() throws IOException {
+ return new DataInputStream( this.openInputStream() );
+ }
+
+ // @Override
+ public InputStream openInputStream() throws IOException {
+ return this.connection.getInputStream();
+ }
+
+ // @Override
+ public void close() throws IOException {
+ this.connection = null;
+ }
+
+ // @Override
+ public DataOutputStream openDataOutputStream() throws IOException {
+ return new DataOutputStream( openOutputStream() );
+ }
+
+ // @Override
+ public OutputStream openOutputStream() throws IOException {
+ return this.connection.getOutputStream();
+ }
+
+}
Added: AndroidME/src_Android/net/yura/android/io/file/AndroidFileConnection.java
===================================================================
--- AndroidME/src_Android/net/yura/android/io/file/AndroidFileConnection.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/io/file/AndroidFileConnection.java 2010-03-22 15:53:50 UTC (rev 727)
@@ -0,0 +1,309 @@
+package net.yura.android.io.file;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.sql.CallableStatement;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
+import java.util.regex.Pattern;
+
+import javax.microedition.io.file.FileConnection;
+
+public class AndroidFileConnection implements FileConnection {
+
+ private static final String SPECIAL_CHARACTERS = "*.^?[]\\";
+
+ public static final File getParentDirectory( File file ) {
+ String path = file.getAbsolutePath();
+ if( path.endsWith( File.separator ) ) {
+ path = path.substring( 0, path.length() - File.separator.length() );
+ }
+ int index = path.lastIndexOf( File.separator );
+ File result;
+ if( index >= 0 ) {
+ path = path.substring( 0, index );
+ result = new File( path );
+ } else {
+ result = null;
+ }
+ return result;
+ }
+
+ private static final String escape( String s ) {
+ StringBuffer result = new StringBuffer( s.length() );
+ for( int i=0; i<s.length(); i++ ) {
+ char c = s.charAt(i);
+ if( SPECIAL_CHARACTERS.indexOf( c ) >= 0 ) {
+ result.append( "\\" );
+ }
+ result.append( c );
+ }
+ return result.toString();
+ }
+
+ public static final File getFile( String url ) {
+ URI uri = URI.create( url );
+ return new File( uri );
+ }
+
+ private File file;
+ private boolean open;
+
+
+ public AndroidFileConnection( String url ) {
+ this(getFile( url ));
+ }
+
+ public AndroidFileConnection( File file ) {
+ this.file = file;
+ this.open = true;
+ }
+
+ // @Override
+ public long availableSize() {
+ // this isn't available
+ return -1;
+ }
+
+ // @Override
+ public boolean canRead() {
+ return this.file.canRead();
+ }
+
+ // @Override
+ public boolean canWrite() {
+ return this.file.canWrite();
+ }
+
+ // @Override
+ public void create() throws IOException {
+ if( !this.file.createNewFile() ) {
+ throw new IOException( "file creation failed" );
+ }
+ }
+
+ // @Override
+ public void delete() throws IOException {
+ if( !this.file.delete() ) {
+ throw new IOException( "file deletion failed" );
+ }
+ }
+
+ // @Override
+ public long directorySize(boolean includeSubDirs) throws IOException {
+ // why is this in the interface?
+ return getDirectorySize( this.file, includeSubDirs );
+ }
+
+ private long getDirectorySize( File file, boolean recursive ) {
+ long size = 0;
+ File[] children = file.listFiles();
+ for( File child : children ) {
+ if( child.isDirectory() ) {
+ if( recursive ) {
+ size += getDirectorySize( child, recursive );
+ }
+ } else {
+ size += child.length();
+ }
+ }
+ return size;
+ }
+
+ // @Override
+ public boolean exists() {
+ return this.file.exists();
+ }
+
+ // @Override
+ public long fileSize() throws IOException {
+ return this.file.length();
+ }
+
+ // @Override
+ public String getName() {
+ return this.file.getName();
+ }
+
+ // @Override
+ public String getPath() {
+ return this.file.getPath();
+ }
+
+ // @Override
+ public String getURL() {
+ return this.file.toURI().toString();
+ }
+
+ // @Override
+ public boolean isDirectory() {
+ return this.file.isDirectory();
+ }
+
+ // @Override
+ public boolean isHidden() {
+ return this.file.isHidden();
+ }
+
+ // @Override
+ public boolean isOpen() {
+ return this.open;
+ }
+
+ // @Override
+ public long lastModified() {
+ return this.file.lastModified();
+ }
+
+ // @Override
+ public Enumeration list() throws IOException {
+ return list( null, false );
+ }
+
+ // @Override
+ public Enumeration list(String filter, boolean includeHidden)
+ throws IOException {
+ Pattern pattern;
+ if( filter != null ) {
+ String[] literalParts = filter.split( "\\*" );
+ StringBuffer sb = new StringBuffer( filter.length() );
+ for( int i=0; i<literalParts.length; i++ ) {
+ String part = literalParts[ i ];
+ String literalPart = escape( part );
+ if( i > 0 ) {
+ sb.append( "*" );
+ }
+ sb.append( literalPart );
+ }
+ pattern = Pattern.compile( sb.toString() );
+ } else {
+ pattern = Pattern.compile( ".*" );
+ }
+ final Pattern filterPattern = pattern;
+ String[] a = this.file.list( new FilenameFilter() {
+
+ // @Override
+ public boolean accept(File dir, String name) {
+ return filterPattern.matcher(name).matches();
+ }
+
+ });
+ List<String> list = Arrays.asList( a );
+ Vector<String> v = new Vector<String>( list );
+ return v.elements();
+ }
+
+ // @Override
+ public void mkdir() throws IOException {
+ if( !this.file.mkdir() ) {
+ throw new IOException( "unable to create directory" );
+ }
+
+ }
+
+ // @Override
+ public DataInputStream openDataInputStream() throws IOException {
+ return new DataInputStream( this.openInputStream() );
+ }
+
+ // @Override
+ public DataOutputStream openDataOutputStream() throws IOException {
+ return new DataOutputStream( this.openOutputStream() );
+ }
+
+ //...
[truncated message content] |
|
From: <jan...@us...> - 2010-03-24 13:39:11
|
Revision: 731
http://swingme.svn.sourceforge.net/swingme/?rev=731&view=rev
Author: janeroski
Date: 2010-03-24 13:39:04 +0000 (Wed, 24 Mar 2010)
Log Message:
-----------
Check for more than one MIDlet
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-03-23 17:32:26 UTC (rev 730)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-03-24 13:39:04 UTC (rev 731)
@@ -1,9 +1,7 @@
package net.yura.android;
-import java.io.IOException;
import java.io.InputStream;
-import java.io.PrintStream;
import java.lang.reflect.Field;
import java.util.Locale;
import java.util.Properties;
@@ -16,7 +14,6 @@
import javax.microedition.midlet.MIDlet;
import net.yura.android.lcdui.Toolkit;
-import net.yura.android.log.LogOutputStream;
import android.app.Activity;
import android.os.Bundle;
@@ -26,337 +23,402 @@
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnKeyListener;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.AdapterView.OnItemClickListener;
-public class AndroidMeMIDlet extends Activity implements Toolkit {
- private static final String MIDLET_PROPERTY = "midlet";
+public class AndroidMeMIDlet extends Activity implements Toolkit, OnItemClickListener {
- private MIDlet midlet;
- private View defaultView;
- private Handler handler;
- private Thread eventThread;
- private Object lock = new Object();
+ private MIDlet midlet;
+ private Vector<String[]> jadMidlets;
+ private View defaultView;
+ private Handler handler;
+ private Thread eventThread;
+ private Object lock = new Object();
- public static AndroidMeMIDlet DEFAULT_ACTIVITY;
+ public static AndroidMeMIDlet DEFAULT_ACTIVITY;
- public AndroidMeMIDlet() {
- DEFAULT_ACTIVITY = this;
- }
+ public AndroidMeMIDlet() {
+ DEFAULT_ACTIVITY = this;
+ }
- public MIDlet getMIDlet() {
- return this.midlet;
- }
+ public MIDlet getMIDlet() {
+ return this.midlet;
+ }
- public Handler getHandler() {
- return handler;
- }
+ public Handler getHandler() {
+ return handler;
+ }
- public void invokeAndWait(final Runnable runnable) {
- if (Thread.currentThread() == this.eventThread) {
- runnable.run();
- } else {
- Runnable r = new Runnable() {
- public void run() {
- synchronized (AndroidMeMIDlet.this.lock) {
- runnable.run();
- AndroidMeMIDlet.this.lock.notify();
- }
- }
- };
- synchronized (this.lock) {
- this.handler.post(r);
- try {
- this.lock.wait();
- } catch (InterruptedException ex) {
- ex.printStackTrace();
- }
- }
- }
- }
+ public void invokeAndWait(final Runnable runnable) {
+ if (Thread.currentThread() == this.eventThread) {
+ runnable.run();
+ } else {
+ Runnable r = new Runnable() {
+ public void run() {
+ synchronized (AndroidMeMIDlet.this.lock) {
+ runnable.run();
+ AndroidMeMIDlet.this.lock.notify();
+ }
+ }
+ };
+ synchronized (this.lock) {
+ this.handler.post(r);
+ try {
+ this.lock.wait();
+ } catch (InterruptedException ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
- @Override
- protected void onCreate(Bundle icicle) {
- super.onCreate(icicle);
- this.handler = new Handler();
- this.eventThread = Thread.currentThread();
+ @Override
+ protected void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ this.handler = new Handler();
+ this.eventThread = Thread.currentThread();
- View splash = this.getLayoutInflater().inflate(R.layout.main, null, false);
- this.defaultView = splash;
- setContentView(splash);
+ View splash = this.getLayoutInflater().inflate(R.layout.main, null, false);
+ this.defaultView = splash;
+ setContentView(splash);
-// PrintStream log = new PrintStream(new LogOutputStream("AndroidMe"));
-// System.setErr(log);
-// System.setOut(log);
- }
+// PrintStream log = new PrintStream(new LogOutputStream("AndroidMe"));
+// System.setErr(log);
+// System.setOut(log);
+ }
- private MIDlet createMIDlet() {
- System.setProperty("microedition.platform", "microemulator-android");
- System.setProperty("microedition.locale", Locale.getDefault().toString());
- System.setProperty("microedition.configuration", "CLDC-1.1");
- System.setProperty("microedition.profiles", "MIDP-2.0");
+ private void startMIDlet(final String midletClassName) {
+ Thread thread = new Thread() {
+ public void run() {
+ while (defaultView.getWidth() == 0) {
+ try {
+ System.out.println("Waiting for view...");
+ Thread.sleep(100);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
- Properties properties = new Properties();
+ try {
+ MIDlet midlet = createMIDlet(midletClassName);
+ AndroidMeMIDlet.this.midlet = midlet;
- try {
- InputStream is = getAssets().open("BadooMobile.jad");
- properties.load(is);
+ if (midlet != null) {
+ midlet.doStartApp();
+ }
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ }
+ }
+ };
- } catch (Throwable e) {
- e.printStackTrace();
- }
+ thread.start();
+ }
- System.out.println(">>>1 " + System.getProperty("microedition.platform"));
+ private MIDlet createMIDlet(String midletClassName) {
- // create a new class loader that correctly handles getResourceAsStream!
+ Properties properties = new Properties();
+ System.setProperty("microedition.platform", "microemulator-android");
+ System.setProperty("microedition.locale", Locale.getDefault().toString());
+ System.setProperty("microedition.configuration", "CLDC-1.1");
+ System.setProperty("microedition.profiles", "MIDP-2.0");
+ try {
+ InputStream is = getAssets().open("BadooMobile.jad");
+ properties.load(is);
- properties.put(MIDLET_PROPERTY, "net.yura.mobile.test.MyMidlet");
- // properties.put(MIDLET_PROPERTY, "com.badoo.locator.BadooMidlet");
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
-// System.out.println(">>> " + net.java.dev.lwuit.speed.SpeedMIDlet.class);
-// properties.put(MIDLET_PROPERTY, "net.java.dev.lwuit.speed.SpeedMIDlet");
+ System.out.println(">>>1 " + System.getProperty("microedition.platform"));
- String midletClassName = properties.getProperty(MIDLET_PROPERTY);
- ClassLoader classLoader;
- classLoader = this.getClassLoader();
- MIDlet midlet;
- MIDlet.DEFAULT_ACTIVITY = this;
- MIDlet.DEFAULT_TOOLKIT = this;
- MIDlet.DEFAULT_APPLICATION_PROPERTIES = properties;
- try {
- Class midletClass = Class.forName(midletClassName, true, classLoader);
- midlet = (MIDlet) midletClass.newInstance();
- } catch (Exception ex) {
- throw new RuntimeException("unable to load class "
- + midletClassName, ex);
- }
- return midlet;
- }
+ // midletClassName = "net.yura.mobile.test.MyMidlet";
+ // midletClassName = "com.badoo.locator.BadooMidlet";
+ // midletClassName = "net.java.dev.lwuit.speed.SpeedMIDlet";
- @Override
- protected void onDestroy() {
- try {
- if (this.midlet != null) {
- this.midlet.doDestroyApp(true);
- this.midlet = null;
- }
- } catch (Exception ex) {
- throw new RuntimeException("unable to destroy", ex);
- }
- // this.resources.getAssets().release();
- super.onDestroy();
- }
- @Override
- protected void onPause() {
- try {
- if (this.midlet != null) {
- this.midlet.doPauseApp();
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- throw new RuntimeException("unable to freeze app", ex);
- }
- super.onPause();
- }
+ jadMidlets = new Vector<String[]>();
+ if (midletClassName == null) {
- @Override
- public void onStop() {
- // TODO: JP
- onDestroy();
- }
+ int count = 0;
+ while (true) {
+ count++;
+ String midletProp = properties.getProperty("MIDlet-" + count);
+ System.out.println(">>>>>>>>> ----------- " + midletProp);
+ if (midletProp == null) {
+ break;
+ }
+ try {
+ int firstComma = midletProp.indexOf(',');
+ int lastComma = midletProp.lastIndexOf(',');
- @Override
- protected void onResume() {
- super.onResume();
+ String midletName = midletProp.substring(0, firstComma).trim();
+ String iconName = midletProp.substring(firstComma + 1, lastComma).trim();
+ String className = midletProp.substring(lastComma + 1).trim();
- if (this.midlet == null) {
- Thread thread = new Thread() {
- public void run() {
- while (defaultView.getWidth() == 0) {
- try {
- Thread.sleep(500);
- System.out.println("W:" + defaultView.getWidth()
- + ",H:" + defaultView.getHeight() + ",MW:"
- + defaultView.getMeasuredWidth() + ",MH:"
- + defaultView.getMeasuredHeight());
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
- MIDlet midlet = createMIDlet();
- AndroidMeMIDlet.this.midlet = midlet;
- try {
- if (midlet != null) {
- midlet.doStartApp();
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
- };
- thread.start();
- } else {
- try {
- this.midlet.doStartApp();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw new RuntimeException("couldn't start MIDlet");
- }
- }
+ String[] midletEntry = {midletName, iconName, className};
+ jadMidlets.add(midletEntry);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
- }
+ if (jadMidlets.size() == 1) {
+ midletClassName = jadMidlets.elementAt(0)[2];
+ }
+ else if (jadMidlets.size() > 1) {
+ ListView listView = new ListView(this);
+ listView.setOnItemClickListener(this);
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
+ String[] listValues = new String[jadMidlets.size()];
+ for (int i = 0; i < jadMidlets.size(); i++) {
+ listValues[i] = jadMidlets.elementAt(i)[0];
+ }
- boolean result = false;
- Display display = Display.getDisplay(midlet);
- Displayable current = display.getCurrent();
- if (current != null) {
- // load the menu items
- menu.clear();
- Vector<Command> commands = current.getCommands();
- for (int i = 0; i < commands.size(); i++) {
- result = true;
- Command cmd = commands.get(i);
- if (cmd.getCommandType() != Command.BACK && cmd.getCommandType() != Command.EXIT) {
- menu.addSubMenu(Menu.NONE, i + Menu.FIRST, Menu.NONE, cmd.getLabel());
- }
- }
- }
- return result;
- }
+ listView.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, listValues));
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- Display display = Display.getDisplay(midlet);
- Displayable current = display.getCurrent();
- if (current != null) {
- Vector<Command> commands = current.getCommands();
+ this.defaultView = listView;
+ invokeAndWait(new Runnable() {
+ public void run() {
+ setContentView(defaultView);
+ }
+ });
+ }
+ }
- int commandIndex = item.getItemId() - Menu.FIRST;
- Command c = commands.get(commandIndex);
- CommandListener l = current.getCommandListener();
+ MIDlet midlet = null;
+ if (midletClassName != null) {
+ // create a new class loader that correctly handles getResourceAsStream!
+ ClassLoader classLoader = this.getClassLoader();
- if (c != null && l != null) {
- l.commandAction(c, current);
- return true;
- }
- }
+ MIDlet.DEFAULT_ACTIVITY = this;
+ MIDlet.DEFAULT_TOOLKIT = this;
+ MIDlet.DEFAULT_APPLICATION_PROPERTIES = properties;
- return false;
- }
+ try {
+ Class midletClass = Class.forName(midletClassName, true, classLoader);
+ midlet = (MIDlet) midletClass.newInstance();
+ } catch (Exception ex) {
+ throw new RuntimeException("unable to load class "
+ + midletClassName, ex);
+ }
+ }
-// @Override
-// public boolean onCreateOptionsMenu(Menu menu) {
-// if (this.midlet != null) {
-// this.midlet.setMenu(menu);
-// } else {
-// this.menu = menu;
-// }
-// return super.onCreateOptionsMenu(menu);
-// }
+ return midlet;
+ }
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
+ @Override
+ protected void onDestroy() {
+ try {
+ if (this.midlet != null) {
+ this.midlet.doDestroyApp(true);
+ this.midlet = null;
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException("unable to destroy", ex);
+ }
+ // this.resources.getAssets().release();
+ super.onDestroy();
+ }
- Displayable displayable = Display.getDisplay(this.midlet).getCurrent();
+ @Override
+ protected void onPause() {
+ try {
+ if (this.midlet != null) {
+ this.midlet.doPauseApp();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw new RuntimeException("unable to freeze app", ex);
+ }
+ super.onPause();
+ }
- if (keyCode == KeyEvent.KEYCODE_BACK) {
- // we need to see if there is a back option in the current display
- for (Command c : displayable.getCommands()) {
- if (c.getCommandType() == Command.BACK) {
- // manually call the back operation: YECH!
- displayable.getCommandListener().commandAction(c,
- displayable);
- return true;
- }
- }
- }
+ @Override
+ public void onStop() {
+ // TODO: JP
+ onDestroy();
+ }
- if (displayable instanceof OnKeyListener) {
- OnKeyListener keyListener = (OnKeyListener) displayable;
- keyListener.onKey(null, keyCode, event);
- }
- return super.onKeyDown(keyCode, event);
- }
+ @Override
+ protected void onResume() {
+ super.onResume();
- public int getResourceId(String resourceName) {
- // slow, slow, slow (cache?)
- // mmmmm, introspection
- String[] splits = resourceName.split("\\.");
- Class c = R.class;
- for (int i = 0; i < splits.length; i++) {
- String name = splits[i];
- if (i < splits.length - 1) {
- Class[] childClasses = c.getDeclaredClasses();
- Class found = null;
- for (int j = 0; j < childClasses.length; j++) {
- Class childClass = childClasses[j];
- String separator;
+ try {
+ if (midlet == null) {
+ startMIDlet(null);
+ }
+ else {
+ midlet.doStartApp();
+ }
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ }
+ }
- if (childClass.getName().endsWith("$" + name)) {
- found = childClass;
- break;
- }
- }
- if (found == null) {
- throw new RuntimeException("no class " + resourceName + "("
- + name + ") in " + c.getName());
- } else {
- c = found;
- }
- } else {
- try {
- Field field = c.getField(name);
- return field.getInt(null);
- } catch (Exception ex) {
- throw new RuntimeException("no field " + name + " in "
- + c.getName());
- }
- }
- }
- throw new RuntimeException("no resource " + resourceName);
- }
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
- public int getScreenHeight() {
- return this.defaultView.getHeight();
- }
+ boolean result = false;
+ Display display = Display.getDisplay(midlet);
+ Displayable current = display.getCurrent();
+ if (current != null) {
+ // load the menu items
+ menu.clear();
+ Vector<Command> commands = current.getCommands();
+ for (int i = 0; i < commands.size(); i++) {
+ result = true;
+ Command cmd = commands.get(i);
+ if (cmd.getCommandType() != Command.BACK && cmd.getCommandType() != Command.EXIT) {
+ menu.addSubMenu(Menu.NONE, i + Menu.FIRST, Menu.NONE, cmd.getLabel());
+ }
+ }
+ }
+ return result;
+ }
- public int getScreenWidth() {
- return this.defaultView.getWidth();
- }
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ Display display = Display.getDisplay(midlet);
+ Displayable current = display.getCurrent();
+ if (current != null) {
+ Vector<Command> commands = current.getCommands();
- public View inflate(int resourceId) {
- return this.getLayoutInflater().inflate(resourceId, null, false);
- }
+ int commandIndex = item.getItemId() - Menu.FIRST;
+ Command c = commands.get(commandIndex);
+ CommandListener l = current.getCommandListener();
- public static InputStream getResourceAsStream(Class origClass, String name)
- throws IOException {
+ if (c != null && l != null) {
+ l.commandAction(c, current);
+ return true;
+ }
+ }
- long time = System.currentTimeMillis();
- System.out.println(">>> getResourceAsStream (" + origClass.getName() + ")" + name);
- long time2 = System.currentTimeMillis() - time;
+ return false;
+ }
- InputStream is = null;
- try {
- if (name.startsWith("/")) {
- name = name.substring(1);
- }
+// @Override
+// public boolean onCreateOptionsMenu(Menu menu) {
+// if (this.midlet != null) {
+// this.midlet.setMenu(menu);
+// } else {
+// this.menu = menu;
+// }
+// return super.onCreateOptionsMenu(menu);
+// }
- is = DEFAULT_ACTIVITY.getAssets().open(name);
- } catch (Throwable e) {
- // e.printStackTrace();
- }
+ @Override
+ public boolean onKeyDown(int keyCode, KeyEvent event) {
- if (is == null) {
- long elapsed = System.currentTimeMillis() - time;
- System.out.println(">>> getResourceAsStream: NOT FOUND. " + time2 + " " + elapsed);
- }
+ Displayable displayable = Display.getDisplay(this.midlet).getCurrent();
- return is;
- }
+ if (keyCode == KeyEvent.KEYCODE_BACK) {
+ // we need to see if there is a back option in the current display
+ for (Command c : displayable.getCommands()) {
+ if (c.getCommandType() == Command.BACK) {
+ // manually call the back operation: YECH!
+ displayable.getCommandListener().commandAction(c,
+ displayable);
+ return true;
+ }
+ }
+ }
+ if (displayable instanceof OnKeyListener) {
+ OnKeyListener keyListener = (OnKeyListener) displayable;
+ keyListener.onKey(null, keyCode, event);
+ }
+
+ return super.onKeyDown(keyCode, event);
+ }
+
+ public int getResourceId(String resourceName) {
+ // slow, slow, slow (cache?)
+ // mmmmm, introspection
+ String[] splits = resourceName.split("\\.");
+ Class c = R.class;
+ for (int i = 0; i < splits.length; i++) {
+ String name = splits[i];
+ if (i < splits.length - 1) {
+ Class[] childClasses = c.getDeclaredClasses();
+ Class found = null;
+ for (int j = 0; j < childClasses.length; j++) {
+ Class childClass = childClasses[j];
+ String separator;
+
+ if (childClass.getName().endsWith("$" + name)) {
+ found = childClass;
+ break;
+ }
+ }
+ if (found == null) {
+ throw new RuntimeException("no class " + resourceName + "("
+ + name + ") in " + c.getName());
+ } else {
+ c = found;
+ }
+ } else {
+ try {
+ Field field = c.getField(name);
+ return field.getInt(null);
+ } catch (Exception ex) {
+ throw new RuntimeException("no field " + name + " in "
+ + c.getName());
+ }
+ }
+ }
+ throw new RuntimeException("no resource " + resourceName);
+ }
+
+ public int getScreenHeight() {
+ return this.defaultView.getHeight();
+ }
+
+ public int getScreenWidth() {
+ return this.defaultView.getWidth();
+ }
+
+ public View inflate(int resourceId) {
+ return this.getLayoutInflater().inflate(resourceId, null, false);
+ }
+
+ public static InputStream getResourceAsStream(Class origClass, String name)
+ {
+
+ long time = System.currentTimeMillis();
+ System.out.println(">>> getResourceAsStream (" + origClass.getName() + ")" + name);
+ long time2 = System.currentTimeMillis() - time;
+
+ InputStream is = null;
+ try {
+ if (name.startsWith("/")) {
+ name = name.substring(1);
+ }
+
+ is = DEFAULT_ACTIVITY.getAssets().open(name);
+ } catch (Throwable e) {
+ // e.printStackTrace();
+ }
+
+ if (is == null) {
+ long elapsed = System.currentTimeMillis() - time;
+ System.out.println(">>> getResourceAsStream: NOT FOUND. " + time2 + " " + elapsed);
+ }
+
+ return is;
+ }
+
+ //@Override
+ public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
+ if (position >= 0) {
+ String midletClassName = jadMidlets.elementAt(position)[2];
+ startMIDlet(midletClassName);
+ }
+ }
+
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-03-23 17:32:26 UTC (rev 730)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-03-24 13:39:04 UTC (rev 731)
@@ -40,7 +40,7 @@
private Bitmap graphicsBitmap;
protected Canvas() {
- this.canvasView = new CanvasView((AndroidMeMIDlet.DEFAULT_ACTIVITY.getMIDlet()).getActivity());
+ this.canvasView = new CanvasView(AndroidMeMIDlet.DEFAULT_ACTIVITY);
}
public void setFullScreenMode(boolean fullScreen) {
@@ -81,7 +81,7 @@
public void repaint(int x, int y, int w, int h) {
if (this.canvasView != null) {
- this.canvasView.postInvalidate(x, y, x + w, y + h);
+ this.canvasView.postInvalidate();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-03-25 13:34:14
|
Revision: 735
http://swingme.svn.sourceforge.net/swingme/?rev=735&view=rev
Author: janeroski
Date: 2010-03-25 13:34:08 +0000 (Thu, 25 Mar 2010)
Log Message:
-----------
Fix some threading issues on creating the MIDlet...
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-03-24 17:02:12 UTC (rev 734)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-03-25 13:34:08 UTC (rev 735)
@@ -33,6 +33,7 @@
private MIDlet midlet;
private Vector<String[]> jadMidlets;
private View defaultView;
+ private View waitingView;
private Handler handler;
private Thread eventThread;
private Object lock = new Object();
@@ -80,34 +81,50 @@
this.handler = new Handler();
this.eventThread = Thread.currentThread();
- View splash = this.getLayoutInflater().inflate(R.layout.main, null, false);
- this.defaultView = splash;
- setContentView(splash);
+ showWaitingView(false);
// PrintStream log = new PrintStream(new LogOutputStream("AndroidMe"));
// System.setErr(log);
// System.setOut(log);
}
- private void startMIDlet(final String midletClassName) {
- Thread thread = new Thread() {
+ private void showContentView(final View view) {
+ invokeAndWait(new Runnable() {
public void run() {
- while (defaultView.getWidth() == 0) {
- try {
- System.out.println("Waiting for view...");
- Thread.sleep(100);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ if (defaultView != view) {
+ setContentView(view);
}
+ }
+ });
+ this.defaultView = view;
+ }
+ private void showWaitingView(boolean wait) {
+ if (waitingView == null) {
+ waitingView = this.getLayoutInflater().inflate(R.layout.main, null, false);
+ }
+
+ showContentView(waitingView);
+
+ if (wait) {
+ while (defaultView.getWidth() == 0) {
try {
+ System.out.println("Waiting for view...");
+ Thread.sleep(100);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+ }
+
+ private void startMIDlet(final String midletClassName) {
+ Thread thread = new Thread() {
+ public void run() {
+ try {
MIDlet midlet = createMIDlet(midletClassName);
AndroidMeMIDlet.this.midlet = midlet;
- if (midlet != null) {
- midlet.doStartApp();
- }
} catch (Throwable ex) {
ex.printStackTrace();
}
@@ -118,6 +135,7 @@
}
private MIDlet createMIDlet(String midletClassName) {
+ showWaitingView(false);
Properties properties = new Properties();
System.setProperty("microedition.platform", "microemulator-android");
@@ -189,31 +207,37 @@
listView.setAdapter(new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, listValues));
- this.defaultView = listView;
- invokeAndWait(new Runnable() {
- public void run() {
- setContentView(defaultView);
- }
- });
+ showContentView(listView);
}
}
- MIDlet midlet = null;
+
if (midletClassName != null) {
+ showWaitingView(true);
+
// create a new class loader that correctly handles getResourceAsStream!
- ClassLoader classLoader = this.getClassLoader();
+ final ClassLoader classLoader = this.getClassLoader();
MIDlet.DEFAULT_ACTIVITY = this;
MIDlet.DEFAULT_TOOLKIT = this;
MIDlet.DEFAULT_APPLICATION_PROPERTIES = properties;
- try {
- Class midletClass = Class.forName(midletClassName, true, classLoader);
- midlet = (MIDlet) midletClass.newInstance();
- } catch (Exception ex) {
- throw new RuntimeException("unable to load class "
- + midletClassName, ex);
- }
+ final String className = midletClassName;
+ invokeAndWait(new Runnable() {
+ public void run() {
+ try {
+ Class midletClass = Class.forName(className, true, classLoader);
+ midlet = (MIDlet) midletClass.newInstance();
+
+ if (midlet != null) {
+ midlet.doStartApp();
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException("unable to load class "
+ + className, ex);
+ }
+ }
+ });
}
return midlet;
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-03-24 17:02:12 UTC (rev 734)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-03-25 13:34:08 UTC (rev 735)
@@ -153,8 +153,22 @@
setFocusableInTouchMode(true);
}
+ long time = System.currentTimeMillis();
+
@Override
protected void onDraw(android.graphics.Canvas androidCanvas) {
+
+ // If Possible, try to not use more than 50% on CPU time on painting...
+ long elapsed = System.currentTimeMillis() - time;
+
+ if (elapsed < 50) {
+ try {
+ System.out.println("paint: elapsed " + elapsed);
+ Thread.sleep(50);
+ } catch (InterruptedException e) {
+ }
+ }
+
if (graphicsBitmap != null && androidCanvas != null) {
// Check for size changes...
@@ -178,6 +192,8 @@
paint(graphics);
androidCanvas.drawBitmap(graphicsBitmap, 0, 0, null);
+
+ time = System.currentTimeMillis();
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-06 16:55:15
|
Revision: 762
http://swingme.svn.sourceforge.net/swingme/?rev=762&view=rev
Author: janeroski
Date: 2010-04-06 16:55:09 +0000 (Tue, 06 Apr 2010)
Log Message:
-----------
Add Virtual keyboard to native Text View
- Add method to show Android Native virtual keyboard
- Don't start the app, if is still in memory
- Ignore key presses, if there is no midlet yet
- Enable rotation and size change of canvas
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-05 21:20:49 UTC (rev 761)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-06 16:55:09 UTC (rev 762)
@@ -2,7 +2,6 @@
import java.io.InputStream;
-import java.lang.reflect.Field;
import java.util.Locale;
import java.util.Properties;
import java.util.Vector;
@@ -16,15 +15,19 @@
import net.yura.android.lcdui.Toolkit;
import android.app.Activity;
+import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.view.ViewGroup;
import android.view.View.OnKeyListener;
+import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.AdapterView.OnItemClickListener;
@@ -35,6 +38,7 @@
private View defaultView;
private View waitingView;
private Handler handler;
+ private InputMethodManager inputManager;
private Thread eventThread;
private Object lock = new Object();
@@ -83,6 +87,17 @@
showWaitingView(false);
+ try {
+ if (midlet == null) {
+ startMIDlet(null);
+ }
+ else {
+ midlet.doStartApp();
+ }
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ }
+
// PrintStream log = new PrintStream(new LogOutputStream("AndroidMe"));
// System.setErr(log);
// System.setOut(log);
@@ -243,59 +258,66 @@
return midlet;
}
- @Override
- protected void onDestroy() {
- try {
- if (this.midlet != null) {
- this.midlet.doDestroyApp(true);
- this.midlet = null;
- }
- } catch (Exception ex) {
- throw new RuntimeException("unable to destroy", ex);
- }
- // this.resources.getAssets().release();
- super.onDestroy();
- }
+// JP - TODO
+// @Override
+// protected void onDestroy() {
+// try {
+// if (this.midlet != null) {
+// this.midlet.doDestroyApp(true);
+// this.midlet = null;
+// }
+// } catch (Exception ex) {
+// throw new RuntimeException("unable to destroy", ex);
+// }
+// // this.resources.getAssets().release();
+// super.onDestroy();
+// }
+//
+// @Override
+// protected void onPause() {
+// try {
+// if (this.midlet != null) {
+// this.midlet.doPauseApp();
+// }
+// } catch (Exception ex) {
+// ex.printStackTrace();
+// throw new RuntimeException("unable to freeze app", ex);
+// }
+// super.onPause();
+// }
+//
+// @Override
+// public void onStop() {
+// // TODO: JP
+////JP onDestroy();
+//
+// super.onStop();
+// }
+//
+//
+// @Override
+// protected void onResume() {
+// super.onResume();
+//
+// try {
+// if (midlet == null) {
+// startMIDlet(null);
+// }
+// else {
+// midlet.doStartApp();
+// }
+// } catch (Throwable ex) {
+// ex.printStackTrace();
+// }
+// }
@Override
- protected void onPause() {
- try {
- if (this.midlet != null) {
- this.midlet.doPauseApp();
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- throw new RuntimeException("unable to freeze app", ex);
- }
- super.onPause();
- }
+ public boolean onPrepareOptionsMenu(Menu menu) {
- @Override
- public void onStop() {
- // TODO: JP
- onDestroy();
- }
-
-
- @Override
- protected void onResume() {
- super.onResume();
-
- try {
- if (midlet == null) {
- startMIDlet(null);
- }
- else {
- midlet.doStartApp();
- }
- } catch (Throwable ex) {
- ex.printStackTrace();
+ if (midlet == null) {
+ return super.onPrepareOptionsMenu(menu);
}
- }
- @Override
- public boolean onPrepareOptionsMenu(Menu menu) {
-
boolean result = false;
Display display = Display.getDisplay(midlet);
Displayable current = display.getCurrent();
@@ -334,19 +356,13 @@
return false;
}
-// @Override
-// public boolean onCreateOptionsMenu(Menu menu) {
-// if (this.midlet != null) {
-// this.midlet.setMenu(menu);
-// } else {
-// this.menu = menu;
-// }
-// return super.onCreateOptionsMenu(menu);
-// }
-
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
+ if (this.midlet == null) {
+ return super.onKeyDown(keyCode, event);
+ }
+
Displayable displayable = Display.getDisplay(this.midlet).getCurrent();
if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ -369,44 +385,6 @@
return super.onKeyDown(keyCode, event);
}
- public int getResourceId(String resourceName) {
- // slow, slow, slow (cache?)
- // mmmmm, introspection
- String[] splits = resourceName.split("\\.");
- Class c = R.class;
- for (int i = 0; i < splits.length; i++) {
- String name = splits[i];
- if (i < splits.length - 1) {
- Class[] childClasses = c.getDeclaredClasses();
- Class found = null;
- for (int j = 0; j < childClasses.length; j++) {
- Class childClass = childClasses[j];
- String separator;
-
- if (childClass.getName().endsWith("$" + name)) {
- found = childClass;
- break;
- }
- }
- if (found == null) {
- throw new RuntimeException("no class " + resourceName + "("
- + name + ") in " + c.getName());
- } else {
- c = found;
- }
- } else {
- try {
- Field field = c.getField(name);
- return field.getInt(null);
- } catch (Exception ex) {
- throw new RuntimeException("no field " + name + " in "
- + c.getName());
- }
- }
- }
- throw new RuntimeException("no resource " + resourceName);
- }
-
public int getScreenHeight() {
return this.defaultView.getHeight();
}
@@ -453,4 +431,11 @@
}
}
+ public void showNativeTextInput() {
+ inputManager = (InputMethodManager) defaultView.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+ //inputManager.hideSoftInputFromWindow(defaultView.getWindowToken(), 0);
+
+ inputManager.toggleSoftInput(InputMethodManager.SHOW_FORCED,0);
+ }
+
}
Modified: AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java
===================================================================
--- AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java 2010-04-05 21:20:49 UTC (rev 761)
+++ AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java 2010-04-06 16:55:09 UTC (rev 762)
@@ -4,15 +4,15 @@
import android.view.View;
public interface Toolkit {
- Handler getHandler();
-
- void invokeAndWait( Runnable r );
-
- int getResourceId( String resourceName );
-
- View inflate( int resourceId );
-
- int getScreenWidth();
-
- int getScreenHeight();
-}
+ Handler getHandler();
+
+ void invokeAndWait(Runnable r);
+
+ View inflate(int resourceId);
+
+ int getScreenWidth();
+
+ int getScreenHeight();
+
+ void showNativeTextInput();
+}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-05 21:20:49 UTC (rev 761)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-06 16:55:09 UTC (rev 762)
@@ -1,6 +1,5 @@
package javax.microedition.lcdui;
-import java.util.Vector;
import javax.microedition.midlet.MIDlet;
import net.yura.android.AndroidMeMIDlet;
@@ -47,16 +46,6 @@
// do nothing, is this possible on android?
}
- @Override
- public int getWidth() {
- return MIDlet.DEFAULT_MIDLET.getToolkit().getScreenWidth();
- }
-
- @Override
- public int getHeight() {
- return MIDlet.DEFAULT_MIDLET.getToolkit().getScreenHeight();
- }
-
public int getGameAction(int keyCode) {
int res;
switch (keyCode) {
@@ -136,7 +125,7 @@
repaint();
}
- public synchronized void repaint() {
+ public void repaint() {
if (this.canvasView != null) {
this.canvasView.postInvalidate();
}
@@ -171,6 +160,10 @@
}
+ protected void sizeChanged(int w, int h) {
+
+ }
+
@Override
public View getView() {
return this.canvasView;
@@ -207,6 +200,11 @@
@Override
protected void onDraw(android.graphics.Canvas androidCanvas) {
+ // Sanity check...
+ if (androidCanvas == null || this.getWidth() <= 0 || this.getHeight() <= 0) {
+ return;
+ }
+
// If Possible, try to not use more than 50% on CPU time on painting...
long elapsed = System.currentTimeMillis() - time;
@@ -221,19 +219,17 @@
if (graphicsBitmap != null && androidCanvas != null) {
// Check for size changes...
- if (graphicsBitmap.getWidth() != androidCanvas.getWidth()
- || graphicsBitmap.getHeight() != androidCanvas
- .getHeight()) {
+ if (graphicsBitmap.getWidth() != this.getWidth() ||
+ graphicsBitmap.getHeight() != this.getHeight()) {
graphicsBitmap = null;
}
}
if (graphicsBitmap == null) {
+ graphicsBitmap = Bitmap.createBitmap(this.getWidth(),
+ this.getHeight(), Bitmap.Config.ARGB_8888);
- graphicsBitmap = Bitmap.createBitmap(androidCanvas.getWidth(),
- androidCanvas.getHeight(), Bitmap.Config.ARGB_8888);
-
graphics.setCanvas(new android.graphics.Canvas(graphicsBitmap));
}
@@ -247,6 +243,7 @@
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+ sizeChanged(w, h);
invalidate();
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java 2010-04-05 21:20:49 UTC (rev 761)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java 2010-04-06 16:55:09 UTC (rev 762)
@@ -1,118 +1,62 @@
package javax.microedition.lcdui;
import javax.microedition.midlet.MIDlet;
+import net.yura.android.AndroidMeMIDlet;
import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-public class TextBox extends Screen implements Runnable
-{
- // TODO : present title and maxSize sensibly
- private String title;
+public class TextBox extends Screen {
private String text;
private int maxSize;
private int constraints;
- private MIDlet midlet;
+ private View currentView;
- private TextView textView;
-
- public TextBox( String title, String text, int maxSize, int constraints )
- {
- this.title = title;
+ public TextBox(String title, String text, int maxSize, int constraints) {
this.text = text;
this.maxSize = maxSize;
this.constraints = constraints;
+
+ // Hack: Current view could change...
+ MIDlet midlet = AndroidMeMIDlet.DEFAULT_ACTIVITY.getMIDlet();
+ this.currentView = Display.getDisplay(midlet).getCurrent().getView();
}
@Override
- public void disposeDisplayable()
- {
- this.textView = null;
- this.midlet = null;
+ public void disposeDisplayable() {
}
@Override
- public View getView()
- {
- LinearLayout view = new LinearLayout(midlet.getActivity());
-
-// if (title != null) {
-// TextView titleView = new TextView(midlet.getActivity());
-// titleView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
-// // TypedArray a = titleView.getContext().obtainStyledAttributes(android.R.style.Theme, null);
-// // titleView.setTextAppearance(titleView.getContext(), a.getResourceId(android.R.style.TextAppearance_Large, -1));
-// titleView.setText(title);
-// view.addView(titleView);
-// }
-
- view.setOrientation(LinearLayout.VERTICAL);
- view.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.FILL_PARENT));
-
- view.addView(textView);
-
- return view;
+ public View getView() {
+ return currentView;
}
@Override
- public void initDisplayable( MIDlet midlet )
- {
- this.midlet = midlet;
- TextView textView = TextField.createTextView( this.constraints, midlet.getActivity() );
- textView.setText( this.text );
- this.textView = textView;
+ public void initDisplayable(MIDlet midlet) {
+ midlet.getToolkit().showNativeTextInput();
}
- public int getMaxSize()
- {
+ public int getMaxSize() {
return this.maxSize;
}
- public void setMaxSize( int maxSize )
- {
+ public void setMaxSize(int maxSize) {
this.maxSize = maxSize;
}
- public String getString()
- {
- String result;
- if( this.textView != null )
- {
- result = this.textView.getText().toString();
- }
- else
- {
- result = this.text;
- }
- return result;
+ public String getString() {
+ return this.text;
}
- public void setString( String text )
- {
+ public void setString(String text) {
this.text = text;
- if( this.textView != null )
- {
- this.midlet.getHandler().post( this );
- }
}
- public int getConstraints()
- {
+ public int getConstraints() {
return this.constraints;
}
- public void setConstraints( int constraints )
- {
+ public void setConstraints(int constraints) {
this.constraints = constraints;
- // TODO : adjust the view if it exists
}
-
- public void run()
- {
- if( this.textView != null )
- {
- this.textView.setText( this.text );
- }
- }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-06 17:01:09
|
Revision: 763
http://swingme.svn.sourceforge.net/swingme/?rev=763&view=rev
Author: janeroski
Date: 2010-04-06 17:01:01 +0000 (Tue, 06 Apr 2010)
Log Message:
-----------
Add manifest and missing libs
Added Paths:
-----------
AndroidME/build/
AndroidME/build/AndroidManifest.xml
AndroidME/build/fix_build.xml
AndroidME/lib/
AndroidME/lib/AndroidFixResourceAsStream.jar
Added: AndroidME/build/AndroidManifest.xml
===================================================================
--- AndroidME/build/AndroidManifest.xml (rev 0)
+++ AndroidME/build/AndroidManifest.xml 2010-04-06 17:01:01 UTC (rev 763)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="net.yura.android"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar">
+ <activity android:name=".AndroidMeMIDlet"
+ android:label="@string/app_name"
+ android:windowSoftInputMode="adjustResize|stateAlwaysVisible"
+ android:screenOrientation="sensor"
+ android:configChanges="orientation|keyboard|keyboardHidden">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ </application>
+ <uses-sdk android:minSdkVersion="4" />
+
+ <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+ <uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
+</manifest>
\ No newline at end of file
Added: AndroidME/build/fix_build.xml
===================================================================
--- AndroidME/build/fix_build.xml (rev 0)
+++ AndroidME/build/fix_build.xml 2010-04-06 17:01:01 UTC (rev 763)
@@ -0,0 +1,16 @@
+
+<project name="fix_Android" default="fix-build" basedir=".">
+
+ <!-- Eclipse uses "bin" for its own output, so we do the same. -->
+ <property name="outdir" location="bin" />
+ <property name="AndroidFixResourceAsStream.jar" value="/Dev/workspace_Android/AndroidFixResourceAsStream/lib/AndroidFixResourceAsStream.jar" />
+
+ <target name="fix-build">
+ <echo>Fixing build....</echo>
+
+ <java classname="net.yura.mobile.asm.AndroidFixer" classpath="${AndroidFixResourceAsStream.jar}">
+ <arg value="net.yura.android.AndroidMeMIDlet"/>
+ <arg value="${outdir}"/>
+ </java>
+ </target>
+</project>
\ No newline at end of file
Added: AndroidME/lib/AndroidFixResourceAsStream.jar
===================================================================
(Binary files differ)
Property changes on: AndroidME/lib/AndroidFixResourceAsStream.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-12 13:20:25
|
Revision: 781
http://swingme.svn.sourceforge.net/swingme/?rev=781&view=rev
Author: janeroski
Date: 2010-04-12 13:20:19 +0000 (Mon, 12 Apr 2010)
Log Message:
-----------
Add Virtual keyboard to native Text View
- Fix for Native Virtual keyboard on Landscape (not resizing view)
- Move location of "showNativeTextInput" method
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-09 14:34:48 UTC (rev 780)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-12 13:20:19 UTC (rev 781)
@@ -15,19 +15,14 @@
import net.yura.android.lcdui.Toolkit;
import android.app.Activity;
-import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
-import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnKeyListener;
import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
-import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.AdapterView.OnItemClickListener;
@@ -356,35 +351,6 @@
return false;
}
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
-
- if (this.midlet == null) {
- return super.onKeyDown(keyCode, event);
- }
-
- Displayable displayable = Display.getDisplay(this.midlet).getCurrent();
-
- if (keyCode == KeyEvent.KEYCODE_BACK) {
- // we need to see if there is a back option in the current display
- for (Command c : displayable.getCommands()) {
- if (c.getCommandType() == Command.BACK) {
- // manually call the back operation: YECH!
- displayable.getCommandListener().commandAction(c,
- displayable);
- return true;
- }
- }
- }
-
- if (displayable instanceof OnKeyListener) {
- OnKeyListener keyListener = (OnKeyListener) displayable;
- keyListener.onKey(null, keyCode, event);
- }
-
- return super.onKeyDown(keyCode, event);
- }
-
public int getScreenHeight() {
return this.defaultView.getHeight();
}
@@ -430,12 +396,4 @@
startMIDlet(midletClassName);
}
}
-
- public void showNativeTextInput() {
- inputManager = (InputMethodManager) defaultView.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
- //inputManager.hideSoftInputFromWindow(defaultView.getWindowToken(), 0);
-
- inputManager.toggleSoftInput(InputMethodManager.SHOW_FORCED,0);
- }
-
}
Modified: AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java
===================================================================
--- AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java 2010-04-09 14:34:48 UTC (rev 780)
+++ AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java 2010-04-12 13:20:19 UTC (rev 781)
@@ -13,6 +13,4 @@
int getScreenWidth();
int getScreenHeight();
-
- void showNativeTextInput();
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-09 14:34:48 UTC (rev 780)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-12 13:20:19 UTC (rev 781)
@@ -6,9 +6,12 @@
import android.content.Context;
import android.graphics.Bitmap;
+import android.graphics.Paint;
+import android.graphics.Rect;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
+import android.view.inputmethod.InputMethodManager;
public abstract class Canvas extends Displayable {
public static final int UP = 1;
@@ -185,8 +188,17 @@
return this.canvasView.graphics;
}
- private class CanvasView extends View {
+ @Override
+ public int getHeight() {
+ int h = canvasView.canvasH;
+ return (h > 0) ? h : super.getHeight();
+ }
+
+ class CanvasView extends View {
javax.microedition.lcdui.Graphics graphics = new Graphics(new android.graphics.Canvas());
+ private int canvasY;
+ private int canvasH;
+ private int keyMenuCount;
public CanvasView(Context context) {
super(context);
@@ -216,28 +228,51 @@
}
}
- if (graphicsBitmap != null && androidCanvas != null) {
+ // WorkArround: View Re-size not done by the platform on landscape
+ // virtual keyboard... Find what bit of the canvas are visible.
+ // 1 - Get location in window, and keep top corner if not
+ // displaying the virtual keyboard.
+ int[] location = {0, 0};
+ getLocationInWindow(location);
+
+ if (location[1] > 0) {
+ canvasY = location[1];
+ canvasH = getHeight();
+ } else {
+ // 2 - Visible height if displaying the virtual keyboard
+ canvasH = getHeight() + location[1] - canvasY;
+ }
+
+ if (graphicsBitmap != null) {
+
// Check for size changes...
if (graphicsBitmap.getWidth() != this.getWidth() ||
- graphicsBitmap.getHeight() != this.getHeight()) {
+ graphicsBitmap.getHeight() != canvasH) {
+ // Notify Canvas clients
+ try {
+ sizeChanged(this.getWidth(), canvasH);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+
graphicsBitmap = null;
}
}
if (graphicsBitmap == null) {
- graphicsBitmap = Bitmap.createBitmap(this.getWidth(),
- this.getHeight(), Bitmap.Config.ARGB_8888);
-
+ graphicsBitmap = Bitmap.createBitmap(this.getWidth(), canvasH, Bitmap.Config.ARGB_8888);
graphics.setCanvas(new android.graphics.Canvas(graphicsBitmap));
}
graphics.reset();
paint(graphics);
- androidCanvas.drawBitmap(graphicsBitmap, 0, 0, null);
+ int graphicsY = getHeight() - canvasH;
+ androidCanvas.drawBitmap(graphicsBitmap, 0, graphicsY, null);
+
time = System.currentTimeMillis();
}
@@ -249,41 +284,58 @@
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
- keyCode = getKeyCode(event);
+ System.out.println("onKeyDown -> " + keyCode);
- if (event.getRepeatCount() == 0) {
- keyPressed(keyCode);
- } else {
- keyRepeated(keyCode);
+ int keyCount = event.getRepeatCount();
+ if (keyCode == KeyEvent.KEYCODE_MENU) {
+ keyMenuCount = keyCount;
+ if (keyMenuCount == 1) {
+ toggleNativeTextInput();
+ }
}
+ else {
+ int meKeyCode = getKeyCode(event);
+ if (keyCount == 0) {
+ keyPressed(meKeyCode);
+ } else {
+ keyRepeated(meKeyCode);
+ }
+ }
+
return true;
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
- keyCode = getKeyCode(event);
- keyReleased(keyCode);
+ int meKeyCode = getKeyCode(event);
+ if (keyCode == KeyEvent.KEYCODE_MENU) {
+ if (keyMenuCount == 0) {
+ // Simulate a press on menu
+ keyPressed(meKeyCode);
+ keyReleased(meKeyCode);
+ }
+ } else {
+ keyReleased(meKeyCode);
+ }
return true;
}
@Override
public boolean onTouchEvent(MotionEvent event) {
- // System.out.println(
- // "("+(int)event.getX()+","+(int)event.getY()+","+event.getAction()+")"
- // );
+ int x = Math.round(event.getX());
+ int y = Math.round(event.getY() - getHeight() + canvasH);
+
+ System.out.println("(" + x + "," + y + "," + event.getAction() + ")");
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
- Canvas.this.pointerPressed(Math.round(event.getX()), Math
- .round(event.getY()));
+ Canvas.this.pointerPressed(x, y);
break;
case MotionEvent.ACTION_UP:
- Canvas.this.pointerReleased(Math.round(event.getX()), Math
- .round(event.getY()));
+ Canvas.this.pointerReleased(x, y);
break;
case MotionEvent.ACTION_MOVE:
- Canvas.this.pointerDragged(Math.round(event.getX()), Math
- .round(event.getY()));
+ Canvas.this.pointerDragged(x, y);
break;
}
@@ -341,6 +393,41 @@
return resultKeyCode;
}
+
+ private InputMethodManager getInputManager() {
+ return (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+ }
+
+ private void fixVirtualKeyboard() {
+ getHandler().postDelayed(new Runnable() {
+ public void run() {
+
+ // WorkArround: View Re-size not done by the platform on landscape
+ // virtual keyboard... Ask to scroll to the bottom of the view.
+ requestRectangleOnScreen(new Rect(0, getHeight() - 1, 1, getHeight()));
+
+ int h = getHeight();
+ if (requestRectangleOnScreen(new Rect(0, h - 1, 1, h), true)) {
+ invalidate();
+ }
+ }
+ }, 500);
+ }
+
+ public void showNativeTextInput() {
+ fixVirtualKeyboard();
+ getInputManager().showSoftInput(this, InputMethodManager.SHOW_FORCED);
+ }
+
+ public void hideNativeTextInput() {
+ fixVirtualKeyboard();
+ getInputManager().hideSoftInputFromWindow(getWindowToken(), 0);
+ }
+
+ public void toggleNativeTextInput() {
+ fixVirtualKeyboard();
+ getInputManager().toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+ }
}
protected void hideNotify() {
@@ -357,7 +444,6 @@
}
public boolean isShown() {
- // TODO Auto-generated method stub
return Display.getDisplay(AndroidMeMIDlet.DEFAULT_ACTIVITY.getMIDlet()).getCurrent() == this;
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java 2010-04-09 14:34:48 UTC (rev 780)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java 2010-04-12 13:20:19 UTC (rev 781)
@@ -10,7 +10,7 @@
private String text;
private int maxSize;
private int constraints;
- private View currentView;
+ private Canvas.CanvasView currentCanvasView;
public TextBox(String title, String text, int maxSize, int constraints) {
this.text = text;
@@ -19,7 +19,11 @@
// Hack: Current view could change...
MIDlet midlet = AndroidMeMIDlet.DEFAULT_ACTIVITY.getMIDlet();
- this.currentView = Display.getDisplay(midlet).getCurrent().getView();
+ View view = Display.getDisplay(midlet).getCurrent().getView();
+
+ if (view instanceof Canvas.CanvasView) {
+ this.currentCanvasView = (Canvas.CanvasView) view;
+ }
}
@Override
@@ -28,12 +32,14 @@
@Override
public View getView() {
- return currentView;
+ return currentCanvasView;
}
@Override
public void initDisplayable(MIDlet midlet) {
- midlet.getToolkit().showNativeTextInput();
+ if (currentCanvasView != null) {
+ currentCanvasView.showNativeTextInput();
+ }
}
public int getMaxSize() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-13 16:59:44
|
Revision: 785
http://swingme.svn.sourceforge.net/swingme/?rev=785&view=rev
Author: janeroski
Date: 2010-04-13 16:59:38 +0000 (Tue, 13 Apr 2010)
Log Message:
-----------
Add Virtual keyboard to native Text View
- Support for different types of keyboards (predictive, numeric, email, etc, etc)
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-13 15:55:56 UTC (rev 784)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-13 16:59:38 UTC (rev 785)
@@ -20,7 +20,6 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.view.inputmethod.InputMethodManager;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
@@ -33,7 +32,6 @@
private View defaultView;
private View waitingView;
private Handler handler;
- private InputMethodManager inputManager;
private Thread eventThread;
private Object lock = new Object();
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-13 15:55:56 UTC (rev 784)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-13 16:59:38 UTC (rev 785)
@@ -6,11 +6,12 @@
import android.content.Context;
import android.graphics.Bitmap;
-import android.graphics.Paint;
import android.graphics.Rect;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
public abstract class Canvas extends Displayable {
@@ -199,6 +200,7 @@
private int canvasY;
private int canvasH;
private int keyMenuCount;
+ private View inputConnectionView;
public CanvasView(Context context) {
super(context);
@@ -278,8 +280,10 @@
@Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- sizeChanged(w, h);
+ fixVirtualKeyboard();
invalidate();
+
+ super.onSizeChanged(w, h, oldw, oldh);
}
@Override
@@ -326,7 +330,7 @@
int x = Math.round(event.getX());
int y = Math.round(event.getY() - getHeight() + canvasH);
- System.out.println("(" + x + "," + y + "," + event.getAction() + ")");
+ // System.out.println("(" + x + "," + y + "," + event.getAction() + ")");
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
Canvas.this.pointerPressed(x, y);
@@ -394,6 +398,10 @@
return resultKeyCode;
}
+ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+ return (inputConnectionView == null) ? null : inputConnectionView.onCreateInputConnection(outAttrs);
+ }
+
private InputMethodManager getInputManager() {
return (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
}
@@ -428,6 +436,22 @@
fixVirtualKeyboard();
getInputManager().toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
}
+
+ public void setInputConnectionView(View view) {
+ if (inputConnectionView != view) {
+ this.inputConnectionView = view;
+ getInputManager().restartInput(this);
+ }
+ }
+
+ public void sendText(CharSequence text) {
+ int count = text.length();
+ for (int i = 0; i < count; i++) {
+ int meKeyCode = text.charAt(i);
+ keyPressed(meKeyCode);
+ keyReleased(meKeyCode);
+ }
+ }
}
protected void hideNotify() {
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java 2010-04-13 15:55:56 UTC (rev 784)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/TextBox.java 2010-04-13 16:59:38 UTC (rev 785)
@@ -4,13 +4,24 @@
import net.yura.android.AndroidMeMIDlet;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.KeyEvent;
import android.view.View;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.widget.EditText;
+
public class TextBox extends Screen {
private String text;
private int maxSize;
private int constraints;
private Canvas.CanvasView currentCanvasView;
+ private TextBoxView textBoxView;
public TextBox(String title, String text, int maxSize, int constraints) {
this.text = text;
@@ -24,6 +35,8 @@
if (view instanceof Canvas.CanvasView) {
this.currentCanvasView = (Canvas.CanvasView) view;
}
+
+ textBoxView = new TextBoxView(AndroidMeMIDlet.DEFAULT_ACTIVITY);
}
@Override
@@ -32,6 +45,9 @@
@Override
public View getView() {
+ if (currentCanvasView != null) {
+ currentCanvasView.setInputConnectionView(textBoxView);
+ }
return currentCanvasView;
}
@@ -65,4 +81,227 @@
public void setConstraints(int constraints) {
this.constraints = constraints;
}
+
+ private class TextBoxView extends View implements InputConnection {
+
+ CharSequence composingText = "";
+
+ public TextBoxView(Context context) {
+ super(context);
+ }
+
+ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+
+ // System.out.println("TextBoxView: onCreateInputConnection " + this);
+
+ EditText editText = new EditText(getContext());
+ editText.onCreateInputConnection(outAttrs);
+
+ outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_EXTRACT_UI;
+
+ int inputType;
+ if ((constraints & TextField.NUMERIC) > 0 || (constraints & TextField.DECIMAL) > 0) {
+ inputType = EditorInfo.TYPE_CLASS_NUMBER;
+ }
+ else if ((constraints & TextField.PHONENUMBER) > 0) {
+ inputType = EditorInfo.TYPE_CLASS_PHONE;
+ }
+ else if ((constraints & TextField.EMAILADDR) > 0) {
+ inputType = EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_VARIATION_EMAIL_ADDRESS;
+ }
+ else if ((constraints & TextField.URL) > 0) {
+ inputType = EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_VARIATION_URI;
+ }
+ else if ((constraints & TextField.PASSWORD) > 0) {
+ inputType = EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_VARIATION_PASSWORD;
+ }
+ else if ((constraints & TextField.INITIAL_CAPS_SENTENCE) > 0) {
+ inputType = EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES;
+ }
+ else if ((constraints & TextField.INITIAL_CAPS_WORD) > 0) {
+ inputType = EditorInfo.TYPE_CLASS_TEXT | EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS;
+ }
+ else {
+ inputType = EditorInfo.TYPE_CLASS_TEXT;
+ }
+
+ outAttrs.inputType = inputType;
+
+ outAttrs.initialCapsMode = getCursorCapsMode(inputType);
+
+ return this;
+ }
+
+
+ //@Override
+ public boolean beginBatchEdit() {
+ // System.out.println("beginBatchEdit");
+ return true;
+ }
+
+ //@Override
+ public boolean endBatchEdit() {
+ // System.out.println("endBatchEdit");
+ return true;
+ }
+
+ //@Override
+ public boolean clearMetaKeyStates(int states) {
+ // System.out.println("clearMetaKeyStates");
+ return true;
+ }
+
+ //@Override
+ public boolean commitCompletion(CompletionInfo text) {
+ // System.out.println("commitCompletion");
+ return true;
+ }
+
+ //@Override
+ public boolean commitText(CharSequence text, int newCursorPosition) {
+ // System.out.println("commitText");
+ sendComposingText(text, true);
+ return true;
+ }
+
+
+
+ //@Override
+ public boolean deleteSurroundingText(int leftLength, int rightLength) {
+ // System.out.println("deleteSurroundingText");
+ return true;
+ }
+
+
+ //@Override
+ public boolean finishComposingText() {
+ // System.out.println("finishComposingText");
+ sendComposingText(composingText, true);
+ return true;
+ }
+
+ //@Override
+ public boolean setComposingText(CharSequence text, int newCursorPosition) {
+ // System.out.println("setComposingText: " + text);
+ sendComposingText(text, false);
+ return true;
+ }
+
+ //@Override
+ public int getCursorCapsMode(int reqModes) {
+ // System.out.println("getCursorCapsMode");
+ int capitalize;
+ if ((constraints & TextField.INITIAL_CAPS_SENTENCE) > 0) {
+
+ capitalize = EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES;
+ } else if ((constraints & TextField.INITIAL_CAPS_WORD) > 0) {
+
+ capitalize = EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS;
+ } else {
+ capitalize = 0;
+ }
+ return capitalize;
+ }
+
+ //@Override
+ public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+ // System.out.println("getExtractedText");
+ sendComposingText(composingText, true);
+ return null;
+ }
+
+ //@Override
+ public CharSequence getTextAfterCursor(int n, int flags) {
+ // System.out.println("getTextAfterCursor");
+ return " ";
+ }
+
+ //@Override
+ public CharSequence getTextBeforeCursor(int n, int flags) {
+ // System.out.println("getTextBeforeCursor");
+ return " ";
+ }
+
+ //@Override
+ public boolean performEditorAction(int actionCode) {
+ // System.out.println("performEditorAction");
+ if(actionCode == EditorInfo.IME_ACTION_UNSPECIFIED) {
+ // The "return" key has been pressed on the IME.
+ sendText("\n");
+ }
+ return true;
+ }
+
+ //@Override
+ public boolean performContextMenuAction(int id) {
+ // System.out.println("performContextMenuAction");
+ return true;
+ }
+
+ //@Override
+ public boolean performPrivateCommand(String action, Bundle data) {
+ // System.out.println("performPrivateCommand");
+ return true;
+ }
+
+ //@Override
+ public boolean sendKeyEvent(KeyEvent event) {
+ // System.out.println("sendKeyEvent");
+ if (currentCanvasView != null) {
+ int keyCode = event.getKeyCode();
+ int action = event.getAction();
+
+ if (action == KeyEvent.ACTION_DOWN) {
+ currentCanvasView.onKeyDown(keyCode, event);
+ } else if (action == KeyEvent.ACTION_UP) {
+ currentCanvasView.onKeyUp(keyCode, event);
+ }
+ }
+ return true;
+ }
+
+ //@Override
+ public boolean setSelection(int start, int end) {
+ // System.out.println("setSelection");
+ return true;
+ }
+
+ //@Override
+ public boolean reportFullscreenMode(boolean enabled) {
+ // System.out.println("reportFullscreenMode");
+ sendComposingText(composingText, true);
+ return true;
+ }
+
+ private void sendText(CharSequence text) {
+ // System.out.println("sendText: >" + text + "<");
+ if (currentCanvasView != null) {
+ currentCanvasView.sendText(text);
+ }
+ }
+
+ private void sendComposingText(CharSequence text, boolean done) {
+
+ // How many chars are the same?
+ int nEqual = 0;
+ for (int i = 0; i < text.length() && i < composingText.length(); i++) {
+ if (text.charAt(i) != composingText.charAt(i)) {
+ break;
+ }
+ nEqual++;
+ }
+
+ // Send as many backspaces as the different chars
+ for (int i = nEqual; i < composingText.length(); i++) {
+ sendText("\b");
+ }
+
+ // Send the new chars
+ for (int i = nEqual; i < text.length(); i++) {
+ sendText(String.valueOf(text.charAt(i)));
+ }
+
+ composingText = done ? "" : text;
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-13 17:02:33
|
Revision: 786
http://swingme.svn.sourceforge.net/swingme/?rev=786&view=rev
Author: janeroski
Date: 2010-04-13 17:02:26 +0000 (Tue, 13 Apr 2010)
Log Message:
-----------
Move AndroidManifest.xml to root
Added Paths:
-----------
AndroidME/AndroidManifest.xml
AndroidME/fix_build.xml
Removed Paths:
-------------
AndroidME/build/AndroidManifest.xml
AndroidME/build/fix_build.xml
Copied: AndroidME/AndroidManifest.xml (from rev 763, AndroidME/build/AndroidManifest.xml)
===================================================================
--- AndroidME/AndroidManifest.xml (rev 0)
+++ AndroidME/AndroidManifest.xml 2010-04-13 17:02:26 UTC (rev 786)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="net.yura.android"
+ android:versionCode="1"
+ android:versionName="1.0">
+ <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar">
+ <activity android:name=".AndroidMeMIDlet"
+ android:label="@string/app_name"
+ android:windowSoftInputMode="adjustResize|stateAlwaysVisible"
+ android:screenOrientation="sensor"
+ android:configChanges="orientation|keyboard|keyboardHidden">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+
+ </application>
+ <uses-sdk android:minSdkVersion="4" />
+
+ <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+ <uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
+</manifest>
\ No newline at end of file
Deleted: AndroidME/build/AndroidManifest.xml
===================================================================
--- AndroidME/build/AndroidManifest.xml 2010-04-13 16:59:38 UTC (rev 785)
+++ AndroidME/build/AndroidManifest.xml 2010-04-13 17:02:26 UTC (rev 786)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="net.yura.android"
- android:versionCode="1"
- android:versionName="1.0">
- <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar">
- <activity android:name=".AndroidMeMIDlet"
- android:label="@string/app_name"
- android:windowSoftInputMode="adjustResize|stateAlwaysVisible"
- android:screenOrientation="sensor"
- android:configChanges="orientation|keyboard|keyboardHidden">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- </application>
- <uses-sdk android:minSdkVersion="4" />
-
- <uses-permission android:name="android.permission.INTERNET"></uses-permission>
- <uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
-</manifest>
\ No newline at end of file
Deleted: AndroidME/build/fix_build.xml
===================================================================
--- AndroidME/build/fix_build.xml 2010-04-13 16:59:38 UTC (rev 785)
+++ AndroidME/build/fix_build.xml 2010-04-13 17:02:26 UTC (rev 786)
@@ -1,16 +0,0 @@
-
-<project name="fix_Android" default="fix-build" basedir=".">
-
- <!-- Eclipse uses "bin" for its own output, so we do the same. -->
- <property name="outdir" location="bin" />
- <property name="AndroidFixResourceAsStream.jar" value="/Dev/workspace_Android/AndroidFixResourceAsStream/lib/AndroidFixResourceAsStream.jar" />
-
- <target name="fix-build">
- <echo>Fixing build....</echo>
-
- <java classname="net.yura.mobile.asm.AndroidFixer" classpath="${AndroidFixResourceAsStream.jar}">
- <arg value="net.yura.android.AndroidMeMIDlet"/>
- <arg value="${outdir}"/>
- </java>
- </target>
-</project>
\ No newline at end of file
Copied: AndroidME/fix_build.xml (from rev 763, AndroidME/build/fix_build.xml)
===================================================================
--- AndroidME/fix_build.xml (rev 0)
+++ AndroidME/fix_build.xml 2010-04-13 17:02:26 UTC (rev 786)
@@ -0,0 +1,16 @@
+
+<project name="fix_Android" default="fix-build" basedir=".">
+
+ <!-- Eclipse uses "bin" for its own output, so we do the same. -->
+ <property name="outdir" location="bin" />
+ <property name="AndroidFixResourceAsStream.jar" value="/Dev/workspace_Android/AndroidFixResourceAsStream/lib/AndroidFixResourceAsStream.jar" />
+
+ <target name="fix-build">
+ <echo>Fixing build....</echo>
+
+ <java classname="net.yura.mobile.asm.AndroidFixer" classpath="${AndroidFixResourceAsStream.jar}">
+ <arg value="net.yura.android.AndroidMeMIDlet"/>
+ <arg value="${outdir}"/>
+ </java>
+ </target>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-16 15:44:40
|
Revision: 798
http://swingme.svn.sourceforge.net/swingme/?rev=798&view=rev
Author: janeroski
Date: 2010-04-16 15:44:33 +0000 (Fri, 16 Apr 2010)
Log Message:
-----------
System Properties: add CellID, LAC, MMC. IMSI, etc
Modified Paths:
--------------
AndroidME/AndroidTODO.txt
AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
Modified: AndroidME/AndroidTODO.txt
===================================================================
--- AndroidME/AndroidTODO.txt 2010-04-16 12:59:04 UTC (rev 797)
+++ AndroidME/AndroidTODO.txt 2010-04-16 15:44:33 UTC (rev 798)
@@ -1,13 +1,13 @@
-- Rotate of the images is broken (e.g. horizontal scroll bar)
-- camera
-- pim 2 versions
-- location/ callId
-- blue tooth
-- sms
-- photo browser being able to go to next and previous image
+- PIM 2 versions
+- Camera
+- Blue tooth
+- SMS
+- Photo browser being able to go to next and previous image
--- DONE ---
+- Location: cellId, MMC, etc
+- Rotate of the images is broken (e.g. horizontal scroll bar)
- Long press on "Menu" should bring the "text keyboard"
- When pressing SwingMe textBox, should show the soft-keyboard, and when the keyboard is visible it should resize the screen, to the available area. when the keyboard is visible and the user presses 'back' then it will hide the native keyboard, also if device has a physical keyboard, do nothing
- Fix rotate
Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2010-04-16 12:59:04 UTC (rev 797)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2010-04-16 15:44:33 UTC (rev 798)
@@ -2,112 +2,168 @@
import java.util.Properties;
-
import javax.microedition.io.ConnectionNotFoundException;
-import javax.microedition.lcdui.Display;
-import javax.microedition.lcdui.Displayable;
-
import net.yura.android.lcdui.Toolkit;
-
import android.app.Activity;
+import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Handler;
-import android.view.View;
+import android.telephony.CellLocation;
+import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyManager;
+import android.telephony.gsm.GsmCellLocation;
public abstract class MIDlet {
- public static final String PROTOCOL_HTTP = "http://";
- public static final String PROTOCOL_HTTPS = "https://";
- public static final String PROTOCOL_SMS = "sms:";
- public static final String PROTOCOL_PHONE = "tel:";
- public static final String PROTOCOL_EMAIL = "email:";
+ public static final String PROTOCOL_HTTP = "http://";
+ public static final String PROTOCOL_HTTPS = "https://";
+ public static final String PROTOCOL_SMS = "sms:";
+ public static final String PROTOCOL_PHONE = "tel:";
+ public static final String PROTOCOL_EMAIL = "email:";
- public static MIDlet DEFAULT_MIDLET;
- public static Toolkit DEFAULT_TOOLKIT;
- public static Activity DEFAULT_ACTIVITY;
- public static Properties DEFAULT_APPLICATION_PROPERTIES;
+ public static MIDlet DEFAULT_MIDLET;
+ public static Toolkit DEFAULT_TOOLKIT;
+ public static Activity DEFAULT_ACTIVITY;
+ public static Properties DEFAULT_APPLICATION_PROPERTIES;
- private Activity activity = DEFAULT_ACTIVITY;
- private Toolkit toolkit = DEFAULT_TOOLKIT;
- private Properties applicationProperties = DEFAULT_APPLICATION_PROPERTIES;
+ private Activity activity = DEFAULT_ACTIVITY;
+ private Toolkit toolkit = DEFAULT_TOOLKIT;
+ private Properties applicationProperties = DEFAULT_APPLICATION_PROPERTIES;
- protected MIDlet() {
- DEFAULT_MIDLET = this;
- }
+ protected MIDlet() {
+ DEFAULT_MIDLET = this;
+ PhoneListener.init();
+ }
- public Properties getApplicationProperties() {
- return applicationProperties;
- }
+ public Properties getApplicationProperties() {
+ return applicationProperties;
+ }
- public void setApplicationProperties(Properties applicationProperties) {
- this.applicationProperties = applicationProperties;
- }
+ public void setApplicationProperties(Properties applicationProperties) {
+ this.applicationProperties = applicationProperties;
+ }
- public Handler getHandler() {
- return this.toolkit.getHandler();
- }
+ public Handler getHandler() {
+ return this.toolkit.getHandler();
+ }
- public void invokeAndWait(Runnable r) {
- this.toolkit.invokeAndWait(r);
- }
+ public void invokeAndWait(Runnable r) {
+ this.toolkit.invokeAndWait(r);
+ }
- public Activity getActivity() {
- return activity;
- }
+ public Activity getActivity() {
+ return activity;
+ }
- public Toolkit getToolkit() {
- return toolkit;
- }
+ public Toolkit getToolkit() {
+ return toolkit;
+ }
- public void setToolkit(Toolkit toolkit) {
- this.toolkit = toolkit;
- }
+ public void setToolkit(Toolkit toolkit) {
+ this.toolkit = toolkit;
+ }
- protected abstract void destroyApp(boolean unconditional)
- throws MIDletStateChangeException;
+ protected abstract void destroyApp(boolean unconditional)
+ throws MIDletStateChangeException;
- protected abstract void pauseApp() throws MIDletStateChangeException;
+ protected abstract void pauseApp() throws MIDletStateChangeException;
- protected abstract void startApp() throws MIDletStateChangeException;
+ protected abstract void startApp() throws MIDletStateChangeException;
- public final void notifyDestroyed() {
- this.activity.finish();
- }
+ public final void notifyDestroyed() {
+ this.activity.finish();
+ }
- public final void doDestroyApp(boolean unconditional)
- throws MIDletStateChangeException {
- this.destroyApp(unconditional);
- }
+ public final void doDestroyApp(boolean unconditional)
+ throws MIDletStateChangeException {
+ this.destroyApp(unconditional);
+ }
- public final void doStartApp() throws MIDletStateChangeException {
- this.startApp();
- }
+ public final void doStartApp() throws MIDletStateChangeException {
+ this.startApp();
+ }
- public final void doPauseApp() throws MIDletStateChangeException {
- this.pauseApp();
- }
+ public final void doPauseApp() throws MIDletStateChangeException {
+ this.pauseApp();
+ }
- public boolean platformRequest(String url)
- throws ConnectionNotFoundException {
- Uri content = Uri.parse(url);
- String action;
- if (url.startsWith(PROTOCOL_PHONE)) {
- action = Intent.ACTION_DIAL;
- } else {
- action = Intent.ACTION_DEFAULT;
- }
- Intent intent = new Intent(action, content);
- this.getActivity().startActivity(intent);
- return false;
- }
+ public boolean platformRequest(String url)
+ throws ConnectionNotFoundException {
+ Uri content = Uri.parse(url);
+ String action;
+ if (url.startsWith(PROTOCOL_PHONE)) {
+ action = Intent.ACTION_DIAL;
+ } else {
+ action = Intent.ACTION_DEFAULT;
+ }
+ Intent intent = new Intent(action, content);
+ this.getActivity().startActivity(intent);
+ return false;
+ }
- public String getAppProperty(String key) {
- return this.applicationProperties.getProperty(key);
- }
+ public String getAppProperty(String key) {
+ return this.applicationProperties.getProperty(key);
+ }
- public int checkPermission(String string) {
- // TODO Auto-generated method stub
- return 0;
- }
+ public int checkPermission(String string) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+
+ private static class PhoneListener extends PhoneStateListener {
+
+ private static PhoneListener instance;
+ static void init() {
+ if (instance == null) {
+ try {
+ instance = new PhoneListener();
+
+ // Register our Telephony Listener, so we can have Cell ID's updates
+ TelephonyManager tm = getTelephonyManager();
+ tm.listen(instance, PhoneListener.LISTEN_CELL_LOCATION);
+ tm.listen(instance, PhoneListener.LISTEN_SIGNAL_STRENGTH);
+
+ // Request Cell Location
+ CellLocation.requestLocationUpdate();
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ static private TelephonyManager getTelephonyManager() {
+ return (TelephonyManager) DEFAULT_ACTIVITY.getSystemService(Context.TELEPHONY_SERVICE);
+ }
+
+
+ @Override
+ public void onCellLocationChanged(CellLocation location) {
+ super.onCellLocationChanged(location);
+
+ try {
+ GsmCellLocation gsmLocation = (GsmCellLocation) location;
+ System.setProperty("CellID", "" + gsmLocation.getCid());
+ System.setProperty("LAC", "" + gsmLocation.getLac());
+
+ TelephonyManager tm = getTelephonyManager();
+ System.setProperty("CMCC", tm.getNetworkCountryIso());
+ System.setProperty("MCC", tm.getSimCountryIso());
+ System.setProperty("IMSI", tm.getSubscriberId());
+
+ // TODO: Docs says NetworkOperator() is MMC + MNC
+ System.setProperty("MNC", tm.getNetworkOperator());
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onSignalStrengthChanged(int asu) {
+ super.onSignalStrengthChanged(asu);
+
+ System.setProperty("NETWORKSIGNAL", "" + asu);
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-17 16:09:20
|
Revision: 805
http://swingme.svn.sourceforge.net/swingme/?rev=805&view=rev
Author: janeroski
Date: 2010-04-17 16:09:14 +0000 (Sat, 17 Apr 2010)
Log Message:
-----------
Add Android Test MIDlet
Added Paths:
-----------
AndroidME/src_Test/
AndroidME/src_Test/net/
AndroidME/src_Test/net/yura/
AndroidME/src_Test/net/yura/android/
AndroidME/src_Test/net/yura/android/MainTest.java
AndroidME/src_Test/net/yura/android/TestMIDlet.java
Added: AndroidME/src_Test/net/yura/android/MainTest.java
===================================================================
--- AndroidME/src_Test/net/yura/android/MainTest.java (rev 0)
+++ AndroidME/src_Test/net/yura/android/MainTest.java 2010-04-17 16:09:14 UTC (rev 805)
@@ -0,0 +1,33 @@
+package net.yura.android;
+
+import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.components.Label;
+import net.yura.mobile.test.MainPane;
+import net.yura.mobile.test.MainPane.Section;
+
+public class MainTest extends Section {
+
+ public MainTest(MainPane mainPane) {
+ super(mainPane);
+ }
+
+ @Override
+ public void createTests() {
+ add(new Label("Android Tests"));
+
+ addTest("PIM", "pim");
+ }
+
+ @Override
+ public void openTest(String actionCommand) {
+ if ("mainmenu".equals(actionCommand)) {
+ addToScrollPane(this, null, makeButton("Exit", "exit"));
+ }
+ else if ("exit".equals(actionCommand)) {
+ Midlet.exit();
+ }
+ else if ("pim".equals(actionCommand)) {
+ //TODO:
+ }
+ }
+}
Added: AndroidME/src_Test/net/yura/android/TestMIDlet.java
===================================================================
--- AndroidME/src_Test/net/yura/android/TestMIDlet.java (rev 0)
+++ AndroidME/src_Test/net/yura/android/TestMIDlet.java 2010-04-17 16:09:14 UTC (rev 805)
@@ -0,0 +1,21 @@
+package net.yura.android;
+
+import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.DesktopPane;
+import net.yura.mobile.test.MainPane;
+
+/**
+ * @author Yura Mamyrin
+ */
+public class TestMIDlet extends Midlet {
+
+ protected DesktopPane makeNewRootPane() {
+ return new MainPane(this);
+ }
+
+ protected void initialize(DesktopPane rp) {
+ MainPane mainPane = (MainPane) rp;
+ mainPane.initialize();
+ mainPane.setMainSection(new MainTest(mainPane));
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-19 16:24:39
|
Revision: 808
http://swingme.svn.sourceforge.net/swingme/?rev=808&view=rev
Author: janeroski
Date: 2010-04-19 16:24:31 +0000 (Mon, 19 Apr 2010)
Log Message:
-----------
PIM: Add new version that allows add/list of PIM in Android 1.6 and 2.1
Modified Paths:
--------------
AndroidME/AndroidManifest.xml
AndroidME/src_MIDP/javax/microedition/pim/ContactList.java
AndroidME/src_MIDP/javax/microedition/pim/PIM.java
AndroidME/src_MIDP/javax/microedition/pim/PIMItem.java
AndroidME/src_MIDP/javax/microedition/pim/PIMList.java
AndroidME/src_Test/net/yura/android/MainTest.java
Added Paths:
-----------
AndroidME/src_Android/net/yura/android/pim/AbstractPIMList.java
AndroidME/src_Android/net/yura/android/pim/AndroidPim.java
AndroidME/src_Android/net/yura/android/pim/ContactDao.java
AndroidME/src_Android/net/yura/android/pim/ContactEnumeration.java
AndroidME/src_Android/net/yura/android/pim/ContactFactory.java
AndroidME/src_Android/net/yura/android/pim/ContactImpl.java
AndroidME/src_Android/net/yura/android/pim/ContactListImpl.java
AndroidME/src_Android/net/yura/android/pim/Field.java
AndroidME/src_Android/net/yura/android/pim/FieldInfo.java
AndroidME/src_MIDP/javax/microedition/pim/UnsupportedFieldException.java
AndroidME/src_Test/net/yura/android/PimTest.java
Removed Paths:
-------------
AndroidME/src_Android/net/yura/android/pim/AndroidContactList.java
AndroidME/src_Android/net/yura/android/pim/AndroidPIMItem.java
AndroidME/src_Android/net/yura/android/pim/AndroidPIMList.java
AndroidME/src_Android/net/yura/android/pim/PreloadingAndroidPIMItem.java
Modified: AndroidME/AndroidManifest.xml
===================================================================
--- AndroidME/AndroidManifest.xml 2010-04-19 11:17:53 UTC (rev 807)
+++ AndroidME/AndroidManifest.xml 2010-04-19 16:24:31 UTC (rev 808)
@@ -21,4 +21,5 @@
<uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
+ <uses-permission android:name="android.permission.WRITE_CONTACTS"></uses-permission>
</manifest>
\ No newline at end of file
Added: AndroidME/src_Android/net/yura/android/pim/AbstractPIMList.java
===================================================================
--- AndroidME/src_Android/net/yura/android/pim/AbstractPIMList.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/pim/AbstractPIMList.java 2010-04-19 16:24:31 UTC (rev 808)
@@ -0,0 +1,154 @@
+package net.yura.android.pim;
+
+import javax.microedition.pim.PIM;
+import javax.microedition.pim.PIMItem;
+import javax.microedition.pim.PIMList;
+import javax.microedition.pim.UnsupportedFieldException;
+
+/**
+ * This is an abstract class to unify common functionality of a PIMList
+ * @author rickyn
+ *
+ */
+public abstract class AbstractPIMList implements PIMList {
+
+ private FieldInfo[] fieldInfos;
+ private final int mode;
+ private final String name;
+
+ public AbstractPIMList(String name, int mode) {
+ this.name = name;
+ if(mode != PIM.READ_ONLY && mode != PIM.WRITE_ONLY && mode != PIM.READ_WRITE) {
+ throw new IllegalArgumentException("The mode '"+mode+"' is not supported.");
+ }
+ this.mode = mode;
+ }
+
+ public FieldInfo findFieldInfo(int fieldId) {
+ return findFieldInfo(fieldId,true);
+ }
+
+ public String getAttributeLabel(int attribute) {
+ switch(attribute) {
+ case PIMItem.ATTR_NONE: return "None";
+ default: throw new IllegalArgumentException("Attribute '"+attribute+"' is not valid.");
+ }
+ }
+
+ public int getFieldDataType(int fieldId) {
+ FieldInfo field = findFieldInfo(fieldId);
+ return field.type;
+ }
+
+ public String getFieldLabel(int fieldId) {
+ FieldInfo field = findFieldInfo(fieldId);
+ return field.label;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public int[] getSupportedArrayElements(int stringArrayField) {
+ FieldInfo fieldInfo = findFieldInfo(stringArrayField);
+ return fieldInfo.supportedArrayElements;
+ }
+
+ public int[] getSupportedAttributes(int field) {
+ FieldInfo fieldInfo = findFieldInfo(field);
+ return fieldInfo.supportedAttributes;
+ }
+
+ public int[] getSupportedFields() {
+ int[] supportedFields = new int[this.fieldInfos.length];
+ for (int i = 0; i < this.fieldInfos.length; i++) {
+ supportedFields[i] = this.fieldInfos[i].pimId;
+ }
+ return supportedFields;
+ }
+
+ public boolean isSupportedArrayElement(int stringArrayField, int arrayElement) {
+ FieldInfo fieldInfo = findFieldInfo(stringArrayField);
+ if(fieldInfo.type != PIMItem.STRING_ARRAY) {
+ throw new IllegalArgumentException("The field with id '"+stringArrayField+"' is not of type 'PIMItem.STRING_ARRAY'.");
+ }
+ int numberOfValues = fieldInfo.supportedArrayElements.length;
+ for(int i = 0; i < numberOfValues; i++) {
+ if(arrayElement == fieldInfo.supportedArrayElements[i]) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean isSupportedAttribute(int field, int attribute) {
+ FieldInfo fieldInfo = findFieldInfo(field);
+ int numberOfValues = fieldInfo.supportedAttributes.length;
+ for(int i = 0; i < numberOfValues; i++) {
+ if(attribute == fieldInfo.supportedAttributes[i]) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean isSupportedField(int fieldId) {
+ FieldInfo field = findFieldInfo(fieldId,false);
+ if(field == null) {
+ return false;
+ }
+ return true;
+ }
+
+ public int maxValues(int field) {
+ return -1;
+ }
+
+ public int stringArraySize(int stringArrayField) {
+ FieldInfo fieldInfo = findFieldInfo(stringArrayField);
+ return fieldInfo.numberOfArrayElements;
+ }
+
+ /**
+ * This method throws a SecurityException if the list is not readable. This is the case if the list was opened in WRITE_ONLY mode.
+ */
+ protected void ensureListReadable() {
+ if(this.mode == PIM.WRITE_ONLY) {
+ throw new SecurityException("The list is only writeable.");
+ }
+ }
+
+ protected void ensureListWriteable() {
+ if(this.mode == PIM.READ_ONLY) {
+ throw new SecurityException("The list is only readable.");
+ }
+ }
+
+ /**
+ * This method will set the fields this list can handle.
+ * @param fieldInfos
+ */
+ protected void setFieldInfos(FieldInfo[] fieldInfos) {
+ this.fieldInfos = fieldInfos;
+ }
+
+ /**
+ *
+ * @param fieldId
+ * @param throwException
+ * @return May return null if no field with the given id is present and now exception should be thrown.
+ */
+ private FieldInfo findFieldInfo(int fieldId, boolean throwException) {
+ for (int i = 0; i < this.fieldInfos.length; i++) {
+ FieldInfo fieldInfo = this.fieldInfos[i];
+ if(fieldId == fieldInfo.pimId) {
+ return fieldInfo;
+ }
+ }
+ if(throwException) {
+ throw new UnsupportedFieldException("The field with id '"+fieldId+"' is not supported.");
+ }
+ return null;
+ }
+
+}
\ No newline at end of file
Deleted: AndroidME/src_Android/net/yura/android/pim/AndroidContactList.java
===================================================================
--- AndroidME/src_Android/net/yura/android/pim/AndroidContactList.java 2010-04-19 11:17:53 UTC (rev 807)
+++ AndroidME/src_Android/net/yura/android/pim/AndroidContactList.java 2010-04-19 16:24:31 UTC (rev 808)
@@ -1,287 +0,0 @@
-package net.yura.android.pim;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.microedition.midlet.MIDlet;
-import javax.microedition.pim.Contact;
-import javax.microedition.pim.ContactList;
-import javax.microedition.pim.PIMItem;
-
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.BaseColumns;
-import android.provider.Contacts;
-
-public class AndroidContactList extends AndroidPIMList implements ContactList
-{
- private static final Map<Integer, String> DEFAULT_COLUMN_MAPPINGS = new HashMap<Integer, String>();
- private static final Map<String, Class> DEFAULT_COLUMN_TYPES = new HashMap<String, Class>();
-
- static
- {
- DEFAULT_COLUMN_MAPPINGS.put( Contact.UID, BaseColumns._ID );
- DEFAULT_COLUMN_TYPES.put( BaseColumns._ID, String.class );
-
- DEFAULT_COLUMN_MAPPINGS.put( Contact.FORMATTED_NAME, Contacts.PeopleColumns.NAME );
- DEFAULT_COLUMN_TYPES.put( Contacts.PeopleColumns.NAME, String.class );
-
- //DEFAULT_COLUMN_MAPPINGS.put( Contact.TITLE, Contacts.PeopleColumns.TITLE );
-
- DEFAULT_COLUMN_MAPPINGS.put( Contact.TEL, Contacts.People.NUMBER );
- DEFAULT_COLUMN_TYPES.put( Contacts.People.NUMBER, String.class );
-
- //DEFAULT_COLUMN_MAPPINGS.put( Contact.EMAIL, Contacts.ContactMethodsColumns.DATA );
- }
-
- public AndroidContactList()
- {
- super(
- "Contacts",
- MIDlet.DEFAULT_MIDLET.getActivity().getContentResolver(),
- Contacts.People.CONTENT_URI,
- convert(
- DEFAULT_COLUMN_MAPPINGS.values(),
- new String[]{
- Contacts.People.PRIMARY_EMAIL_ID,
- Contacts.People.PRIMARY_PHONE_ID
- }
- )
- );
- }
-
- @Override
- protected PIMItem create( Cursor cursor )
- {
- AndroidContact contact = new AndroidContact( cursor );
-
- return contact;
- }
-
- private static class PhoneNumber
- {
- private String number;
- private int attributes;
-
- public PhoneNumber( String number, int attributes )
- {
- this.number = number;
- this.attributes = attributes;
- }
-
- public String getNumber() {
- return number;
- }
-
- public int getAttributes() {
- return attributes;
- }
-
-
- }
-
- private class AndroidContact extends PreloadingAndroidPIMItem implements Contact
- {
- private ArrayList<PhoneNumber> phoneNumbers;
- private String emailAddress;
-
- public AndroidContact( Cursor cursor )
- {
- super( cursor, DEFAULT_COLUMN_MAPPINGS, DEFAULT_COLUMN_TYPES );
-
- // look up the phone numbers for this person
-
- String id = this.getString( Contact.UID, 0 );
- String preferredPhoneId = this.getString(
- Contacts.People.PRIMARY_PHONE_ID
- );
- String preferredEmailId = this.getString(
- Contacts.People.PRIMARY_EMAIL_ID
- );
-
- Uri emailUri = Contacts.ContactMethods.CONTENT_URI;
- Cursor emailCursor = AndroidContactList.this.contentResolver.query(
- emailUri,
- new String[]{
- Contacts.ContactMethods._ID,
- Contacts.ContactMethods.TYPE,
- Contacts.ContactMethods.DATA
- },
- Contacts.ContactMethods.PERSON_ID+"=?",
- new String[]{ id },
- null
- );
- String emailAddress = null;
-
- int dataColumn = emailCursor.getColumnIndex( Contacts.ContactMethods.DATA );
- int emailTypeColumn = emailCursor.getColumnIndex( Contacts.ContactMethods.TYPE );
- int emailIdColumn = emailCursor.getColumnIndex( Contacts.ContactMethods._ID );
- while( emailCursor.moveToNext() )
- {
- String data = emailCursor.getString( dataColumn );
- String type = emailCursor.getString( emailTypeColumn );
- String emailId = emailCursor.getString( emailIdColumn );
- if( emailAddress == null || Contacts.ContactMethods.CONTENT_EMAIL_TYPE.equals( type ) )
- {
- emailAddress = data;
- }
- if( emailId != null && emailId.equals( preferredEmailId ) )
- {
- emailAddress = data;
- break;
- }
- }
- emailCursor.close();
- this.emailAddress = emailAddress;
-
- Uri phoneUri = Contacts.Phones.CONTENT_URI;
- Cursor phoneCursor = AndroidContactList.this.contentResolver.query(
- phoneUri,
- new String[]{
- Contacts.Phones._ID,
- Contacts.Phones.NUMBER,
- Contacts.Phones.TYPE,
- Contacts.Phones.PERSON_ID
- },
- Contacts.Phones.PERSON_ID+"=?",
- new String[]{ id },
- null
- );
-
- int numberColumn = phoneCursor.getColumnIndex( Contacts.Phones.NUMBER );
- int typeColumn = phoneCursor.getColumnIndex( Contacts.Phones.TYPE );
- int idColumn = phoneCursor.getColumnIndex( Contacts.Phones._ID );
-
- ArrayList<PhoneNumber> phoneNumbers = new ArrayList<PhoneNumber>();
-
- while( phoneCursor.moveToNext() )
- {
- String number = phoneCursor.getString( numberColumn );
- int type = phoneCursor.getInt( typeColumn );
- String phoneId = phoneCursor.getString( idColumn );
- int attributes = 0;
- if( type == Contacts.Phones.TYPE_MOBILE )
- {
- attributes = attributes | Contact.ATTR_MOBILE;
- }
- if( type == Contacts.Phones.TYPE_WORK )
- {
- attributes = attributes | Contact.ATTR_WORK;
- }
- if( type == Contacts.Phones.TYPE_HOME )
- {
- attributes = attributes | Contact.ATTR_HOME;
- }
- if( phoneId != null && phoneId.equals( preferredPhoneId ) )
- {
- attributes = attributes | Contact.ATTR_PREFERRED;
- }
- PhoneNumber phoneNumber = new PhoneNumber( number, attributes );
- phoneNumbers.add( phoneNumber );
- }
- phoneCursor.close();
- this.phoneNumbers = phoneNumbers;
-
- }
-
- public int getPreferredIndex( int field )
- {
- return 0;
- }
-
- @Override
- public int countValues( int field )
- {
- int result;
- if( field == Contact.TEL )
- {
- result = this.phoneNumbers.size();
- }
- else
- {
- result = super.countValues( field );
- }
- return result;
- }
-
- @Override
- public int getAttributes( int field, int index )
- {
- int result;
- if( field == Contact.TEL )
- {
- result = this.phoneNumbers.get( index ).getAttributes();
- }
- else if( field == Contact.EMAIL )
- {
- result = this.emailAddress != null ? 1 : 0;
- }
- else
- {
- result = super.getAttributes( field, index );
- }
- return result;
- }
-
- @Override
- public String getString(int field, int index)
- {
- String result;
- if( field == Contact.TEL )
- {
- result = this.phoneNumbers.get( index ).getNumber();
- }
- else if( field == Contact.EMAIL )
- {
- result = this.emailAddress;
- }
- else
- {
- result = super.getString( field, index );
- }
- return result;
- }
-
- @Override
- public String[] getStringArray(int field, int index)
- {
- String[] result;
- if( field == Contact.NAME )
- {
- String fullName = getString( Contact.FORMATTED_NAME, 0 );
- int spaceIndex = fullName.indexOf( ' ' );
- String firstName;
- String lastName;
- String title = getString( Contact.TITLE, 0 );
- String prefix = null;
- String postfix = null;
- if( spaceIndex >= 0 )
- {
- firstName = fullName.substring( 0, spaceIndex );
- lastName = fullName.substring( spaceIndex + 1 );
- }
- else
- {
- firstName = fullName;
- lastName = null;
- }
- result = new String[]{ firstName, lastName, title, prefix, postfix };
- }
- else
- {
- result = super.getStringArray( field, index );
- }
- return result;
- }
-
-
- }
-
- // @Override
- public boolean isSupportedField(int fieldName) {
- return DEFAULT_COLUMN_MAPPINGS.containsKey( fieldName );
- }
-
-
-}
Deleted: AndroidME/src_Android/net/yura/android/pim/AndroidPIMItem.java
===================================================================
--- AndroidME/src_Android/net/yura/android/pim/AndroidPIMItem.java 2010-04-19 11:17:53 UTC (rev 807)
+++ AndroidME/src_Android/net/yura/android/pim/AndroidPIMItem.java 2010-04-19 16:24:31 UTC (rev 808)
@@ -1,81 +0,0 @@
-package net.yura.android.pim;
-
-import java.util.Map;
-
-import javax.microedition.pim.PIMItem;
-
-import android.database.Cursor;
-
-public class AndroidPIMItem implements PIMItem
-{
- private Cursor cursor;
- private Map<Integer, String> columnMappings;
-
- public AndroidPIMItem( Cursor cursor, Map<Integer, String> columnMappings )
- {
- this.cursor = cursor;
- this.columnMappings = columnMappings;
-
- }
-
-// @Override
- public int countValues( int field )
- {
- return 1;
- }
-
-// @Override
- public int getAttributes( int field, int index )
- {
- return 0;
- }
-
- public long getDate( String columnName ) {
- return this.cursor.getLong( this.cursor.getColumnIndex( columnName ) );
- }
-
-// @Override
- public long getDate( int field, int index )
- {
- return getDate( getColumnName(field) );
- }
-
- public String getString( String columnName )
- {
- return this.cursor.getString( this.cursor.getColumnIndex( columnName ) );
- }
-
-// @Override
- public String getString( int field, int index )
- {
- return this.getString( getColumnName( field ) );
- }
-
- public String[] getStringArray( String columnName ) {
- return new String[]{ getString( columnName ) };
- }
-
-// @Override
- public String[] getStringArray(int field, int index)
- {
- return getStringArray( this.getColumnName( field ) );
- }
-
- protected String getColumnName( int field )
- {
- return this.columnMappings.get( field );
- }
-
- protected int getColumnIndex( int field )
- {
- String columnName = getColumnName( field );
- if( columnName != null )
- {
- return this.cursor.getColumnIndex( columnName );
- }
- else
- {
- throw new NullPointerException( "no column name for field "+field );
- }
- }
-}
Deleted: AndroidME/src_Android/net/yura/android/pim/AndroidPIMList.java
===================================================================
--- AndroidME/src_Android/net/yura/android/pim/AndroidPIMList.java 2010-04-19 11:17:53 UTC (rev 807)
+++ AndroidME/src_Android/net/yura/android/pim/AndroidPIMList.java 2010-04-19 16:24:31 UTC (rev 808)
@@ -1,125 +0,0 @@
-package net.yura.android.pim;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-
-import javax.microedition.pim.PIMException;
-import javax.microedition.pim.PIMItem;
-import javax.microedition.pim.PIMList;
-
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.net.Uri;
-
-public abstract class AndroidPIMList implements PIMList
-{
- public static final String[] convert( Collection<String> values )
- {
- return convert( values, new String[ 0 ] );
- }
-
- public static final String[] convert( Collection<String> values, String[] additional )
- {
- String[] names = new String[ values.size() + additional.length ];
- System.arraycopy( additional, 0, names, 0, additional.length );
- int pos = additional.length;
- for( String value : values )
- {
- names[ pos ] = value;
- pos++;
- }
- return names;
- }
-
- private String name;
- private String[] columnNames;
- protected ContentResolver contentResolver;
- private Uri contentURI;
- private Collection<Cursor> cursors;
-
- protected AndroidPIMList(
- String name,
- ContentResolver contentResolver,
- Uri contentURI,
- String[] columnNames )
- {
- this.name = name;
- this.contentResolver = contentResolver;
- this.contentURI = contentURI;
- this.columnNames = columnNames;
- this.cursors = new ArrayList<Cursor>();
-
- }
-
-// @Override
- public void close() throws PIMException
- {
- for( Cursor cursor : this.cursors )
- {
- cursor.close();
- }
- this.cursors.clear();
- }
-
- public String getName() {
- return this.name;
- }
-
-// @Override
- public Enumeration items() throws PIMException
- {
-
- Cursor cursor = this.contentResolver.query(
- this.contentURI,
- this.columnNames,
- null,
- null,
- null
- );
- if( cursor == null )
- {
- StringBuilder columnNames = new StringBuilder();
- for( int i=0; i<this.columnNames.length; i++ )
- {
- String columnName = this.columnNames[ i ];
- columnNames.append( columnName );
- if( i < this.columnNames.length-1 )
- {
- columnNames.append( ", " );
- }
- }
- throw new PIMException( "invalid query "+this.contentURI.toString()+" "+columnNames );
- }
- this.cursors.add( cursor );
- return new AndroidPIMListEnumeration( cursor );
- }
-
- protected abstract PIMItem create( Cursor cursor );
-
- private class AndroidPIMListEnumeration implements Enumeration
- {
- private Cursor cursor;
-
- public AndroidPIMListEnumeration( Cursor cursor )
- {
- this.cursor = cursor;
- cursor.moveToFirst();
- }
-
-// @Override
- public boolean hasMoreElements()
- {
- return !this.cursor.isAfterLast();
- }
-
-// @Override
- public Object nextElement()
- {
- PIMItem item = AndroidPIMList.this.create( this.cursor );
- this.cursor.moveToNext();
- return item;
- }
-
- }
-}
Added: AndroidME/src_Android/net/yura/android/pim/AndroidPim.java
===================================================================
--- AndroidME/src_Android/net/yura/android/pim/AndroidPim.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/pim/AndroidPim.java 2010-04-19 16:24:31 UTC (rev 808)
@@ -0,0 +1,76 @@
+package net.yura.android.pim;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Hashtable;
+
+import javax.microedition.pim.PIM;
+import javax.microedition.pim.PIMException;
+import javax.microedition.pim.PIMItem;
+import javax.microedition.pim.PIMList;
+
+public class AndroidPim extends PIM {
+
+ public static final String DEFAULT_PIMLIST_NAME_CONTACTS = "contacts";
+ private static Hashtable<Integer, ContactListImpl> contactListInstances = new Hashtable<Integer, ContactListImpl>();
+
+ @Override
+ public PIMItem[] fromSerialFormat(InputStream is, String enc) throws PIMException, UnsupportedEncodingException {
+ throw new UnsupportedEncodingException("At the moment no encoding is supported.");
+ }
+
+ @Override
+ public String[] listPIMLists(int pimListType) {
+ switch(pimListType) {
+ case PIM.CONTACT_LIST:
+ return new String[] {DEFAULT_PIMLIST_NAME_CONTACTS};
+ default:
+ return new String[0];
+ }
+ }
+
+ @Override
+ public PIMList openPIMList(int pimListType, int mode) throws PIMException {
+ switch(pimListType) {
+ case PIM.CONTACT_LIST:
+ return openPIMList(pimListType, mode,DEFAULT_PIMLIST_NAME_CONTACTS);
+ default:
+ throw new PIMException("The pimListType '"+pimListType+"' is not supported.");
+ }
+
+ }
+
+ @Override
+ public PIMList openPIMList(int pimListType, int mode, String name) throws PIMException {
+ switch(pimListType) {
+ case PIM.CONTACT_LIST:
+ if( ! DEFAULT_PIMLIST_NAME_CONTACTS.equals(name)) {
+ throw new PIMException("A PIMList with name '"+name+"' and type '"+pimListType+"' does not exist.");
+ }
+
+ ContactListImpl contactList = contactListInstances.get(mode);
+ if (contactList == null) {
+//JP: The list is being re-used... Once open in one mode, it can no longer change... at least have one per mode...
+// contactListInstance = new ContactListImpl(name,mode);
+
+ contactList = new ContactListImpl(name, mode);
+ contactListInstances.put(mode, contactList);
+ }
+ return contactList;
+ default:
+ throw new PIMException("The pimListType '"+pimListType+"' is not supported.");
+ }
+ }
+
+ @Override
+ public String[] supportedSerialFormats(int pimListType) {
+ return new String[0];
+ }
+
+ @Override
+ public void toSerialFormat(PIMItem item, OutputStream os, String enc, String dataFormat) throws PIMException, UnsupportedEncodingException {
+ throw new UnsupportedEncodingException("At the moment no encoding is supported.");
+ }
+
+}
Added: AndroidME/src_Android/net/yura/android/pim/ContactDao.java
===================================================================
--- AndroidME/src_Android/net/yura/android/pim/ContactDao.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/pim/ContactDao.java 2010-04-19 16:24:31 UTC (rev 808)
@@ -0,0 +1,212 @@
+package net.yura.android.pim;
+
+import java.util.Enumeration;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.Contacts;
+import android.provider.Contacts.People;
+import javax.microedition.pim.Contact;
+
+import net.yura.android.AndroidMeMIDlet;
+
+/**
+ * This Data Access Object will manage JavaME PIM contact objects and talks to the sqlite3 database on android.
+ * It uses API level 4 and not the new ContactsContract.
+ * @author rickyn
+ *
+ */
+public class ContactDao {
+
+ private final ContactListImpl contactListImpl;
+ private final ContentResolver contentResolver;
+
+ public ContactDao(ContactListImpl contactListImpl) {
+ this.contactListImpl = contactListImpl;
+ this.contentResolver = AndroidMeMIDlet.DEFAULT_ACTIVITY.getContentResolver();
+ }
+
+ private void addNonEmptyString(StringBuffer buffer, String str) {
+ if (str != null) {
+ if (buffer.length() > 0) {
+ buffer.append(' ');
+ }
+ buffer.append(str);
+ }
+ }
+
+ public void persist(ContactImpl contact) {
+ final boolean isNew = contact.isNew();
+ final Uri personUri;
+ final ContentValues values = new ContentValues();
+
+ // Update the name
+ values.clear();
+ StringBuffer buffer = new StringBuffer();
+ String[] names = contact.getStringArray(Contact.NAME, 0);
+
+ addNonEmptyString(buffer, names[Contact.NAME_PREFIX]);
+ addNonEmptyString(buffer, names[Contact.NAME_GIVEN]);
+ addNonEmptyString(buffer, names[Contact.NAME_FAMILY]);
+ addNonEmptyString(buffer, names[Contact.NAME_SUFFIX]);
+ addNonEmptyString(buffer, names[Contact.NAME_OTHER]);
+
+ values.put(People.NAME, buffer.toString());
+
+ // Update the note
+ int numberOfNotes = contact.countValues(Contact.NOTE);
+ if(numberOfNotes > 0) {
+ String name = contact.getString(Contact.NOTE, 0);
+ values.put(People.NOTES, name);
+ }
+
+ if(isNew) {
+ personUri = this.contentResolver.insert(People.CONTENT_URI, values);
+ long id = ContentUris.parseId(personUri);
+ // insert this contact into "My Contacts" group in order to see it in the Contact viewer
+ try {
+ Contacts.People.addToMyContactsGroup(this.contentResolver, id);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+ } else {
+ long id = contact.getId();
+ personUri = ContentUris.withAppendedId(People.CONTENT_URI, id);
+ this.contentResolver.update(personUri, values, null, null);
+ }
+
+ // Update the address.
+ int numberOfAddresses = contact.countValues(Contact.ADDR);
+ for(int i = 0; i < numberOfAddresses; i++) {
+ Uri addressUri = Uri.withAppendedPath(personUri, Contacts.People.ContactMethods.CONTENT_DIRECTORY);
+ values.clear();
+ values.put(Contacts.ContactMethods.KIND,new Integer(Contacts.KIND_POSTAL));
+
+ int attributes = contact.getAttributes(Contact.ADDR, i);
+ int type = convertAttrToAddressType(attributes);
+ values.put(Contacts.ContactMethods.TYPE,new Integer(type));
+
+ String[] addressElements = contact.getStringArray(Contact.ADDR, i);
+ buffer = new StringBuffer();
+ if (addressElements[Contact.ADDR_POBOX] != null) {
+ buffer.append("PoBox ");
+ addNonEmptyString(buffer, addressElements[Contact.ADDR_POBOX]);
+ }
+ addNonEmptyString(buffer, addressElements[Contact.ADDR_STREET]);
+ addNonEmptyString(buffer, addressElements[Contact.ADDR_POSTALCODE]);
+ addNonEmptyString(buffer, addressElements[Contact.ADDR_LOCALITY]);
+ addNonEmptyString(buffer, addressElements[Contact.ADDR_COUNTRY]);
+ addNonEmptyString(buffer, addressElements[Contact.ADDR_EXTRA]);
+
+ values.put(Contacts.ContactMethods.DATA,buffer.toString());
+ this.contentResolver.insert(addressUri, values);
+ }
+
+ int numberOfEMails = contact.countValues(Contact.EMAIL);
+ for(int i = 0; i < numberOfEMails; i++) {
+ Uri addressUri = Uri.withAppendedPath(personUri, Contacts.People.ContactMethods.CONTENT_DIRECTORY);
+ values.clear();
+ buffer = new StringBuffer();
+ buffer.append(contact.getString(Contact.EMAIL, i));
+ values.put(Contacts.ContactMethods.DATA,buffer.toString());
+
+ values.put(Contacts.ContactMethods.KIND,new Integer(Contacts.KIND_EMAIL));
+
+ int attributes = contact.getAttributes(Contact.EMAIL, i);
+ int type = convertAttrToAddressType(attributes);
+ values.put(Contacts.ContactMethods.TYPE,new Integer(type));
+
+ this.contentResolver.insert(addressUri, values);
+ }
+
+ // Update the telephone number.
+ int numberOfTelephoneNumbers = contact.countValues(Contact.TEL);
+ for (int i = 0; i < numberOfTelephoneNumbers; i++) {
+ Uri phoneUri = Uri.withAppendedPath(personUri, Contacts.People.Phones.CONTENT_DIRECTORY);
+ values.clear();
+ String telephoneNumber = contact.getString(Contact.TEL, i);
+ values.put(Contacts.People.Phones.NUMBER,telephoneNumber);
+
+ int attributes = contact.getAttributes(Contact.TEL, i);
+ int type = convertAttrToTelType(attributes);
+ values.put(Contacts.ContactMethods.TYPE,new Integer(type));
+
+ this.contentResolver.insert(phoneUri, values);
+ }
+ }
+
+ private int convertAttrToAddressType(int attribute) {
+ if((attribute & Contact.ATTR_HOME) == Contact.ATTR_HOME){
+ return Contacts.ContactMethods.TYPE_HOME;
+ }
+ if((attribute & Contact.ATTR_WORK) == Contact.ATTR_WORK){
+ return Contacts.ContactMethods.TYPE_WORK;
+ }
+ if((attribute & Contact.ATTR_OTHER) == Contact.ATTR_OTHER){
+ return Contacts.ContactMethods.TYPE_OTHER;
+ }
+ return Contacts.ContactMethods.TYPE_OTHER;
+ }
+
+ private int convertAttrToTelType(int attribute) {
+ if((attribute & Contact.ATTR_MOBILE) == Contact.ATTR_MOBILE){
+ return Contacts.People.Phones.TYPE_MOBILE;
+ }
+ if((attribute & Contact.ATTR_FAX) == Contact.ATTR_FAX){
+ if((attribute & Contact.ATTR_HOME) == Contact.ATTR_HOME){
+ return Contacts.People.Phones.TYPE_FAX_HOME;
+ }
+ if((attribute & Contact.ATTR_WORK) == Contact.ATTR_WORK){
+ return Contacts.People.Phones.TYPE_FAX_WORK;
+ }
+ return Contacts.People.Phones.TYPE_FAX_WORK;
+ }
+ if((attribute & Contact.ATTR_HOME) == Contact.ATTR_HOME){
+ return Contacts.People.Phones.TYPE_HOME;
+ }
+ if((attribute & Contact.ATTR_WORK) == Contact.ATTR_WORK){
+ return Contacts.People.Phones.TYPE_WORK;
+ }
+ if((attribute & Contact.ATTR_PAGER) == Contact.ATTR_PAGER){
+ return Contacts.People.Phones.TYPE_PAGER;
+ }
+ if((attribute & Contact.ATTR_OTHER) == Contact.ATTR_OTHER){
+ return Contacts.People.Phones.TYPE_OTHER;
+ }
+ return Contacts.People.Phones.TYPE_OTHER;
+ }
+
+ publi...
[truncated message content] |
|
From: <jan...@us...> - 2010-04-21 10:08:58
|
Revision: 809
http://swingme.svn.sourceforge.net/swingme/?rev=809&view=rev
Author: janeroski
Date: 2010-04-21 10:08:51 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
Multimedia API: Add stubs for Camera Player
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
AndroidME/src_MIDP/javax/microedition/media/Manager.java
AndroidME/src_Test/net/yura/android/MainTest.java
AndroidME/src_Test/net/yura/android/PimTest.java
Added Paths:
-----------
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
AndroidME/src_Test/net/yura/android/MultimediaTest.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-19 16:24:31 UTC (rev 808)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-21 10:08:51 UTC (rev 809)
@@ -146,11 +146,26 @@
showWaitingView(false);
Properties properties = new Properties();
- System.setProperty("microedition.platform", "microemulator-android");
+ System.setProperty("microedition.platform", "androidMe");
System.setProperty("microedition.locale", Locale.getDefault().toString());
System.setProperty("microedition.configuration", "CLDC-1.1");
System.setProperty("microedition.profiles", "MIDP-2.0");
+ // Multimedia Properties
+ System.setProperty("microedition.media.version", "1.2");
+ System.setProperty("supports.mixing", "false");
+ System.setProperty("supports.audio.capture", "false");
+ System.setProperty("supports.video.capture", "false ");
+ System.setProperty("supports.recording", "false");
+ System.setProperty("audio.encodings", "");
+ System.setProperty("video.encodings", "");
+ System.setProperty("video.snapshot.encodings", "encoding=image/jpeg encoding=image/jpg");
+ System.setProperty("streamable.contents", "");
+
+ // PIM and File (Note: "file.separator" already setup by Android OS)
+ System.setProperty("microedition.pim.version", "1.0");
+ System.setProperty("microedition.io.file.FileConnection.version", "1.0");
+
try {
String[] assetList = getResources().getAssets().list("");
for (int i = 0; i < assetList.length; i++) {
Added: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java (rev 0)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java 2010-04-21 10:08:51 UTC (rev 809)
@@ -0,0 +1,159 @@
+package javax.microedition.media.player;
+
+import javax.microedition.media.Control;
+import javax.microedition.media.Controllable;
+import javax.microedition.media.MediaException;
+import javax.microedition.media.Player;
+import javax.microedition.media.PlayerListener;
+import javax.microedition.media.control.VideoControl;
+
+public class CameraPlayer implements Player, VideoControl, Controllable {
+
+ // @Override
+ public Control getControl(String controlType) {
+ if ("VideoControl".equalsIgnoreCase(controlType) ||
+ "GUIControl".equalsIgnoreCase(controlType)) {
+ return this;
+ } else {
+ return null;
+ }
+ }
+
+ // @Override
+ public Control[] getControls() {
+ return new Control[] { this };
+ }
+
+ // @Override
+ public void addPlayerListener(PlayerListener playerListener) {
+ // TODO Auto-generated method stub
+
+ }
+
+ // @Override
+ public void close() {
+ // TODO Auto-generated method stub
+
+ }
+
+ // @Override
+ public void deallocate() {
+ // TODO Auto-generated method stub
+ }
+
+ // @Override
+ public String getContentType() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ // @Override
+ public long getDuration() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ // @Override
+ public long getMediaTime() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ // @Override
+ public int getState() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ // @Override
+ public void prefetch() {
+ // TODO Auto-generated method stub
+ }
+
+ // @Override
+ public void realize() {
+ // TODO Auto-generated method stub
+ }
+
+ // @Override
+ public void removePlayerListener(PlayerListener playerListener) {
+ // TODO Auto-generated method stub
+ }
+
+ // @Override
+ public void setLoopCount(int count) {
+ // TODO Auto-generated method stub
+ }
+
+ // @Override
+ public long setMediaTime(long now) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ // @Override
+ public void start() {
+ // TODO Auto-generated method stub
+ }
+
+ // @Override
+ public void stop() {
+ // TODO Auto-generated method stub
+ }
+
+ public int getDisplayHeight() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public int getDisplayWidth() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public int getDisplayX() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public int getDisplayY() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public byte[] getSnapshot(String s) throws MediaException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getSourceHeight() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public int getSourceWidth() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public Object initDisplayMode(int i, Object obj) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void setDisplayFullScreen(boolean flag) throws MediaException {
+ // TODO Auto-generated method stub
+ }
+
+ public void setDisplayLocation(int i, int j) {
+ // TODO Auto-generated method stub
+ }
+
+ public void setDisplaySize(int i, int j) throws MediaException {
+ // TODO Auto-generated method stub
+ }
+
+ public void setVisible(boolean flag) {
+ // TODO Auto-generated method stub
+ }
+}
Modified: AndroidME/src_MIDP/javax/microedition/media/Manager.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/media/Manager.java 2010-04-19 16:24:31 UTC (rev 808)
+++ AndroidME/src_MIDP/javax/microedition/media/Manager.java 2010-04-21 10:08:51 UTC (rev 809)
@@ -2,41 +2,58 @@
import java.io.IOException;
-public class Manager
-{
- public static final String TONE_DEVICE_LOCATOR = "tone_device";
-
- public static Player createPlayer( java.io.InputStream ins, String type ) throws IOException, MediaException
- {
- return null;
- }
-
- public static Player createPlayer( String locator ) throws IOException, MediaException
- {
- Player player;
- if( TONE_DEVICE_LOCATOR.equals( locator ) )
- {
- player = new TonePlayer();
- }
- else
- {
- player = null;
- }
- return player;
- }
-
- public static void playTone( int note, int duration, int volume ) throws MediaException
- {
- // do nothing
- }
-
- public static String[] getSupportedContentTypes( String protocol )
- {
- return new String[ 0 ];
- }
-
- public String[] getSupportedProtocols( String content_type )
- {
- return new String[ 0 ];
- }
+import javax.microedition.media.player.CameraPlayer;
+
+public class Manager {
+ public static final String TONE_DEVICE_LOCATOR = "tone_device";
+
+ public static Player createPlayer(java.io.InputStream ins, String type)
+ throws IOException, MediaException {
+ return null;
+ }
+
+ public static Player createPlayer(String locator) throws IOException,
+ MediaException {
+ Player player;
+ if (locator == null) {
+ player = null;
+ }
+ else if (locator.startsWith("capture://video")) {
+ player = new CameraPlayer();
+ }
+ else if (TONE_DEVICE_LOCATOR.equals(locator)) {
+ player = new TonePlayer();
+ } else {
+ player = null;
+ }
+
+ return player;
+ }
+
+ public static void playTone(int note, int duration, int volume)
+ throws MediaException {
+ // do nothing
+ }
+
+ public static String[] getSupportedContentTypes(String protocol) {
+ String[] res;
+ if (protocol == null || "capture".equals(protocol)) {
+ res = new String[] {"video"};
+ }
+ else {
+ res = new String[0];
+ }
+ return res;
+ }
+
+ public static String[] getSupportedProtocols(String contentType) {
+ String[] res;
+ if (contentType == null || "video".equals(contentType)) {
+ res = new String[] {"capture"};
+ }
+ else {
+ res = new String[0];
+ }
+ return res;
+ }
}
Modified: AndroidME/src_Test/net/yura/android/MainTest.java
===================================================================
--- AndroidME/src_Test/net/yura/android/MainTest.java 2010-04-19 16:24:31 UTC (rev 808)
+++ AndroidME/src_Test/net/yura/android/MainTest.java 2010-04-21 10:08:51 UTC (rev 809)
@@ -16,6 +16,7 @@
add(new Label("Android Tests"));
addSection("PIM", new PimTest());
+ addSection("Multimedia", new MultimediaTest());
}
// @Override
Added: AndroidME/src_Test/net/yura/android/MultimediaTest.java
===================================================================
--- AndroidME/src_Test/net/yura/android/MultimediaTest.java (rev 0)
+++ AndroidME/src_Test/net/yura/android/MultimediaTest.java 2010-04-21 10:08:51 UTC (rev 809)
@@ -0,0 +1,91 @@
+package net.yura.android;
+
+
+import javax.microedition.lcdui.Graphics;
+import javax.microedition.media.Manager;
+
+import net.yura.mobile.gui.components.Label;
+import net.yura.mobile.gui.components.Panel;
+import net.yura.mobile.gui.components.TextArea;
+import net.yura.mobile.gui.layout.FlowLayout;
+import net.yura.mobile.test.MainPane.Section;
+
+public class MultimediaTest extends Section {
+
+
+// @Override
+ public void createTests() {
+ add(new Label("Android Tests"));
+
+
+ addTest("Properties", "showProperties");
+ addTest("Protocols", "showProtocols");
+ addTest("Content Types", "showContentTypes");
+ }
+
+// @Override
+ public void openTest(String actionCommand) {
+
+ String text = "";
+ if ("showProperties".equals(actionCommand)) {
+ String[] props = {
+ "microedition.media.version",
+ "supports.mixing",
+ "supports.audio.capture",
+ "supports.video.capture",
+ "supports.recording",
+ "audio.encodings",
+ "video.encodings",
+ "video.snapshot.encodings",
+ "streamable.contents",
+ };
+
+ text = "--- Properties ---";
+ for (int i = 0; i < props.length; i++) {
+ text += "\n" + props[i] + ": " + System.getProperty(props[i]);
+ }
+ }
+ else if ("showProtocols".equals(actionCommand)) {
+
+ String[] protos = Manager.getSupportedProtocols(null);
+
+ text = "--- Protocols ---";
+ for (int i = 0; i < protos.length; i++) {
+ text += "\n" + protos[i];
+ }
+
+ for (int i = 0; i < protos.length; i++) {
+ text += "\n\n-- Content for " + protos[i] + " --";
+
+ String[] content = Manager.getSupportedContentTypes(protos[i]);
+ for (int j = 0; j < content.length; j++) {
+ text += "\n" + content[j];
+ }
+ }
+ }
+ else if ("showContentTypes".equals(actionCommand)) {
+ String[] contents = Manager.getSupportedContentTypes(null);
+
+ text = "--- Content Types ---";
+ for (int i = 0; i < contents.length; i++) {
+ text += "\n" + contents[i];
+ }
+
+ for (int i = 0; i < contents.length; i++) {
+ text += "\n\n-- Protocols for " + contents[i] + " --";
+
+ String[] content = Manager.getSupportedProtocols(contents[i]);
+ for (int j = 0; j < content.length; j++) {
+ text += "\n" + content[j];
+ }
+ }
+ }
+
+ Panel mainPanel = new Panel(new FlowLayout(Graphics.VCENTER));
+ TextArea cell = new TextArea(text);
+ cell.setFocusable(false);
+ mainPanel.add(cell);
+
+ addToScrollPane(mainPanel, null );
+ }
+}
Modified: AndroidME/src_Test/net/yura/android/PimTest.java
===================================================================
--- AndroidME/src_Test/net/yura/android/PimTest.java 2010-04-19 16:24:31 UTC (rev 808)
+++ AndroidME/src_Test/net/yura/android/PimTest.java 2010-04-21 10:08:51 UTC (rev 809)
@@ -6,7 +6,6 @@
import javax.microedition.pim.Contact;
import javax.microedition.pim.ContactList;
import javax.microedition.pim.PIM;
-import javax.microedition.pim.PIMException;
import javax.microedition.pim.PIMItem;
import net.yura.mobile.gui.components.Button;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-21 12:24:30
|
Revision: 811
http://swingme.svn.sourceforge.net/swingme/?rev=811&view=rev
Author: janeroski
Date: 2010-04-21 12:24:24 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
Add BasicPlayer
- All multimedia players will extend this class.
- Implements JSR135 state management and Player event delivery
Modified Paths:
--------------
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
AndroidME/src_MIDP/javax/microedition/media/Manager.java
Added Paths:
-----------
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
Added: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java (rev 0)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java 2010-04-21 12:24:24 UTC (rev 811)
@@ -0,0 +1,281 @@
+package javax.microedition.media.player;
+
+import java.util.Vector;
+
+import javax.microedition.media.Control;
+import javax.microedition.media.MediaException;
+import javax.microedition.media.Player;
+import javax.microedition.media.PlayerListener;
+
+import net.yura.android.lcdui.Toolkit;
+
+public abstract class BasicPlayer implements Player {
+
+ // Player's state
+ int state = UNREALIZED;
+
+ // Player Listener List
+ Vector<PlayerListener> listenerList = new Vector<PlayerListener>();
+
+ Toolkit toolKit;
+
+ // Player worker methods
+ abstract protected void doRealize() throws MediaException;
+ abstract protected void doPrefetch() throws MediaException;
+ abstract protected boolean doStart() throws MediaException;
+ abstract protected void doStop();
+ abstract protected void doDeallocate();
+ abstract protected void doClose();
+ abstract protected long doSetMediaTime(long now) throws MediaException;
+ abstract protected long doGetMediaTime();
+ abstract protected long doGetDuration();
+ abstract protected Control[] doGetControls();
+ abstract protected Control doGetControl(String type);
+
+
+ public BasicPlayer(Toolkit toolKit) {
+ this.toolKit = toolKit;
+ }
+
+ /**
+ * Check to see if the Player is closed. If the
+ * unrealized boolean flag is true, check also to
+ * see if the Player is UNREALIZED.
+ *
+ * @param unrealized the flag whether to check the unrealized state.
+ */
+ protected void chkClosed(boolean unrealized) {
+ if (state == CLOSED || (unrealized && state == UNREALIZED)) {
+ throw new IllegalStateException("The Player is " +
+ (state == CLOSED ? "closed" : "unrealized"));
+ }
+ }
+
+ public void setLoopCount(int count) throws IllegalArgumentException, IllegalStateException {
+ chkClosed(false);
+ if (state == STARTED) {
+ throw new IllegalStateException("setLoopCount");
+ }
+ if (count == 0 || count < -1) {
+ throw new IllegalArgumentException("setLoopCount");
+ }
+
+//JP loopCountSet = count;
+// loopCount = count;
+ }
+
+ public synchronized void realize() throws MediaException {
+ chkClosed(false);
+
+ if (state < REALIZED) {
+ doRealize();
+ state = REALIZED;
+ }
+ }
+
+
+ public synchronized void prefetch() throws MediaException {
+ chkClosed(false);
+
+ if (state < PREFETCHED) {
+
+ realize();
+ doPrefetch();
+
+ state = PREFETCHED;
+ }
+ }
+
+
+ public synchronized void start() throws MediaException {
+ chkClosed(false);
+
+ if (state < STARTED) {
+ realize();
+ prefetch();
+
+ // If it's at the EOM, it will automatically
+ // loop back to the beginning.
+// JP if (EOM)
+// setMediaTime(0);
+
+ doStart();
+
+ state = STARTED;
+ sendEvent(PlayerListener.STARTED, new Long(getMediaTime()));
+ }
+ }
+
+ public synchronized void stop() {
+ chkClosed(false);
+
+//JP loopAfterEOM = false;
+
+ if (state >= STARTED) {
+ doStop();
+
+ state = PREFETCHED;
+ sendEvent(PlayerListener.STOPPED, new Long(getMediaTime()));
+ }
+ }
+
+ public synchronized void deallocate() {
+ chkClosed(false);
+
+//JP loopAfterEOM = false;
+
+ if (state >= PREFETCHED) {
+ stop();
+ doDeallocate();
+ state = REALIZED;
+ }
+ }
+
+ public synchronized void close() {
+ if (state > CLOSED) {
+ deallocate();
+ doClose();
+
+ state = CLOSED;
+
+//JP try {
+// if (stream != null)
+// stream.close();
+// } catch (IOException e) { }
+
+ sendEvent(PlayerListener.CLOSED, null);
+ }
+ }
+
+ public synchronized long setMediaTime(long now) throws MediaException {
+ chkClosed(true);
+
+ if (now < 0) {
+ now = 0;
+ }
+
+ long theDur = getDuration();
+ if ((theDur != TIME_UNKNOWN) && (now > theDur)) {
+ now = theDur;
+ }
+
+ long rtn = doSetMediaTime(now);
+//JP EOM = false;
+
+ return rtn;
+ }
+
+ public long getMediaTime() {
+ chkClosed(false);
+ return doGetMediaTime();
+ }
+
+ public int getState() {
+ // A race condition can occur between the return of this method and the
+ // execution of a state changing method.
+ return state;
+ }
+
+ public long getDuration() {
+ chkClosed(false);
+ return doGetDuration();
+ }
+
+ // @Override
+ public void addPlayerListener(PlayerListener playerListener) {
+ chkClosed(false);
+ if (playerListener != null && !listenerList.contains(playerListener)) {
+ listenerList.add(playerListener);
+ }
+ }
+
+ public void removePlayerListener(PlayerListener playerListener) {
+ chkClosed(false);
+ listenerList.remove(playerListener);
+ }
+
+ public void sendEvent(final String evt, final Object evtData) {
+
+ // There's always one listener for EOM -- itself.
+ if (listenerList.size() > 0 || evt == PlayerListener.END_OF_MEDIA) {
+
+ toolKit.invokeAndWait(new Runnable() {
+
+ public void run() {
+ if (evt == PlayerListener.END_OF_MEDIA) {
+ synchronized (BasicPlayer.this) {
+//JP EOM = true;
+// loopAfterEOM = false;
+
+ if (state > Player.PREFETCHED) {
+ state = Player.PREFETCHED;
+
+//JP if (loopCount > 1 || loopCount == -1) {
+// loopAfterEOM = true;
+// }
+ }
+ }
+ }
+
+ synchronized (listenerList) {
+ for (int i = 0; i < listenerList.size(); i++) {
+ try {
+ PlayerListener l = listenerList.elementAt(i);
+ l.playerUpdate(BasicPlayer.this, evt, evtData);
+ }
+ catch (Exception e) {
+ System.err.println("Error in playerUpdate: " + e);
+ }
+ }
+ }
+
+//JP if (loopAfterEOM) {
+// doLoop();
+// }
+
+ }
+ });
+ }
+ }
+
+
+//JP /**
+// * the worker method to deliver EOM event
+// */
+// synchronized void doLoop() {
+//
+// // If a loop count is set, we'll loop back to the beginning.
+// if ((loopCount > 1) || (loopCount == -1)) {
+// try {
+// if (setMediaTime(0) == 0) {
+// if (loopCount > 1)
+// loopCount--;
+// start();
+// } else
+// loopCount = 1;
+// } catch (MediaException ex) {
+// loopCount = 1;
+// }
+// } else if (loopCountSet > 1)
+// loopCount = loopCountSet;
+//
+// loopAfterEOM = false;
+// }
+
+ public Control[] getControls() {
+ chkClosed(true);
+ return doGetControls();
+ }
+
+ public Control getControl(String type) {
+ chkClosed(true);
+
+ // Prepend the package name if the type given does not
+ // have the package prefix.
+ if (type.indexOf('.') < 0) {
+ type = "javax.microedition.media.control." + type;
+ }
+
+ return doGetControl(type);
+ }
+}
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java 2010-04-21 12:21:57 UTC (rev 810)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java 2010-04-21 12:24:24 UTC (rev 811)
@@ -3,101 +3,82 @@
import javax.microedition.media.Control;
import javax.microedition.media.Controllable;
import javax.microedition.media.MediaException;
-import javax.microedition.media.Player;
-import javax.microedition.media.PlayerListener;
import javax.microedition.media.control.VideoControl;
-public class CameraPlayer implements Player, VideoControl, Controllable {
+import net.yura.android.lcdui.Toolkit;
- // @Override
- public Control getControl(String controlType) {
- if ("VideoControl".equalsIgnoreCase(controlType) ||
- "GUIControl".equalsIgnoreCase(controlType)) {
- return this;
- } else {
- return null;
- }
- }
+public class CameraPlayer extends BasicPlayer implements VideoControl, Controllable {
- // @Override
- public Control[] getControls() {
- return new Control[] { this };
+
+ public CameraPlayer(Toolkit toolKit) {
+ super(toolKit);
}
- // @Override
- public void addPlayerListener(PlayerListener playerListener) {
+ @Override
+ protected void doClose() {
// TODO Auto-generated method stub
}
- // @Override
- public void close() {
+ @Override
+ protected void doDeallocate() {
// TODO Auto-generated method stub
}
- // @Override
- public void deallocate() {
- // TODO Auto-generated method stub
- }
+ @Override
+ protected Control doGetControl(String type) {
+ if ("VideoControl".equalsIgnoreCase(type) ||
+ "GUIControl".equalsIgnoreCase(type)) {
+ return this;
+ }
- // @Override
- public String getContentType() {
- // TODO Auto-generated method stub
return null;
}
- // @Override
- public long getDuration() {
- // TODO Auto-generated method stub
- return 0;
+ @Override
+ protected Control[] doGetControls() {
+ return new Control[] { this };
}
- // @Override
- public long getMediaTime() {
+ @Override
+ protected long doGetDuration() {
// TODO Auto-generated method stub
return 0;
}
- // @Override
- public int getState() {
+ @Override
+ protected long doGetMediaTime() {
// TODO Auto-generated method stub
return 0;
}
- // @Override
- public void prefetch() {
+ @Override
+ protected void doPrefetch() throws MediaException {
// TODO Auto-generated method stub
- }
- // @Override
- public void realize() {
- // TODO Auto-generated method stub
}
- // @Override
- public void removePlayerListener(PlayerListener playerListener) {
+ @Override
+ protected void doRealize() throws MediaException {
// TODO Auto-generated method stub
- }
- // @Override
- public void setLoopCount(int count) {
- // TODO Auto-generated method stub
}
- // @Override
- public long setMediaTime(long now) {
+ @Override
+ protected long doSetMediaTime(long now) throws MediaException {
// TODO Auto-generated method stub
return 0;
}
- // @Override
- public void start() {
+ @Override
+ protected boolean doStart() throws MediaException {
// TODO Auto-generated method stub
+ return false;
}
- // @Override
- public void stop() {
+ @Override
+ protected void doStop() {
// TODO Auto-generated method stub
}
@@ -156,4 +137,11 @@
public void setVisible(boolean flag) {
// TODO Auto-generated method stub
}
+
+ public String getContentType() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
}
Modified: AndroidME/src_MIDP/javax/microedition/media/Manager.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/media/Manager.java 2010-04-21 12:21:57 UTC (rev 810)
+++ AndroidME/src_MIDP/javax/microedition/media/Manager.java 2010-04-21 12:24:24 UTC (rev 811)
@@ -4,6 +4,8 @@
import javax.microedition.media.player.CameraPlayer;
+import net.yura.android.AndroidMeMIDlet;
+
public class Manager {
public static final String TONE_DEVICE_LOCATOR = "tone_device";
@@ -19,7 +21,7 @@
player = null;
}
else if (locator.startsWith("capture://video")) {
- player = new CameraPlayer();
+ player = new CameraPlayer(AndroidMeMIDlet.DEFAULT_ACTIVITY);
}
else if (TONE_DEVICE_LOCATOR.equals(locator)) {
player = new TonePlayer();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-21 17:41:37
|
Revision: 813
http://swingme.svn.sourceforge.net/swingme/?rev=813&view=rev
Author: janeroski
Date: 2010-04-21 17:41:30 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
Multimedia API: Show view finder
Modified Paths:
--------------
AndroidME/AndroidManifest.xml
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
AndroidME/src_MIDP/javax/microedition/media/Player.java
AndroidME/src_MIDP/javax/microedition/media/PlayerListener.java
Modified: AndroidME/AndroidManifest.xml
===================================================================
--- AndroidME/AndroidManifest.xml 2010-04-21 17:17:39 UTC (rev 812)
+++ AndroidME/AndroidManifest.xml 2010-04-21 17:41:30 UTC (rev 813)
@@ -17,9 +17,12 @@
</application>
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4" />
- <uses-permission android:name="android.permission.INTERNET"></uses-permission>
- <uses-permission android:name="android.permission.READ_CONTACTS"></uses-permission>
- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
- <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
- <uses-permission android:name="android.permission.WRITE_CONTACTS"></uses-permission>
+ <uses-feature android:name="android.hardware.camera" />
+
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.READ_CONTACTS" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+ <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+ <uses-permission android:name="android.permission.CAMERA" />
</manifest>
\ No newline at end of file
Modified: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-21 17:17:39 UTC (rev 812)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-21 17:41:30 UTC (rev 813)
@@ -34,7 +34,6 @@
private Handler handler;
private Thread eventThread;
private Object lock = new Object();
- private Vector<View> overlayViews = new Vector<View>();
public static AndroidMeMIDlet DEFAULT_ACTIVITY;
@@ -97,26 +96,6 @@
// System.setOut(log);
}
-
- @Override
- public void setContentView(View view) {
- super.setContentView(view);
-
- for (int i = 0; i < overlayViews.size(); i++) {
- super.addContentView(overlayViews.elementAt(i), null);
- }
- }
-
- public void addOverlayView(View v) {
- if (!overlayViews.contains(v)) {
- overlayViews.add(v);
- }
- }
-
- public void removeOverlayView(View v) {
- overlayViews.remove(v);
- }
-
private void showContentView(final View view) {
invokeAndWait(new Runnable() {
public void run() {
Modified: AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java
===================================================================
--- AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java 2010-04-21 17:17:39 UTC (rev 812)
+++ AndroidME/src_Android/net/yura/android/lcdui/Toolkit.java 2010-04-21 17:41:30 UTC (rev 813)
@@ -10,10 +10,6 @@
View inflate(int resourceId);
- void addOverlayView(View v);
-
- void removeOverlayView(View v);
-
int getScreenWidth();
int getScreenHeight();
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java 2010-04-21 17:17:39 UTC (rev 812)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java 2010-04-21 17:41:30 UTC (rev 813)
@@ -22,10 +22,11 @@
// Player worker methods
abstract protected void doRealize() throws MediaException;
abstract protected void doPrefetch() throws MediaException;
- abstract protected boolean doStart() throws MediaException;
+ abstract protected void doStart() throws MediaException;
abstract protected void doStop();
abstract protected void doDeallocate();
abstract protected void doClose();
+
abstract protected long doSetMediaTime(long now) throws MediaException;
abstract protected long doGetMediaTime();
abstract protected long doGetDuration();
@@ -68,7 +69,7 @@
chkClosed(false);
if (state < REALIZED) {
- doRealize();
+ sendPlayerEvent("doRealize", null);
state = REALIZED;
}
}
@@ -80,7 +81,7 @@
if (state < PREFETCHED) {
realize();
- doPrefetch();
+ sendPlayerEvent("doPrefetch", null);
state = PREFETCHED;
}
@@ -99,10 +100,10 @@
// JP if (EOM)
// setMediaTime(0);
- doStart();
+ sendPlayerEvent("doStart", null);
state = STARTED;
- sendEvent(PlayerListener.STARTED, new Long(getMediaTime()));
+ sendListenerEvent(PlayerListener.STARTED, new Long(getMediaTime()));
}
}
@@ -112,10 +113,14 @@
//JP loopAfterEOM = false;
if (state >= STARTED) {
- doStop();
+ try {
+ sendPlayerEvent("doStop", null);
+ }
+ catch (Exception e) {
+ }
state = PREFETCHED;
- sendEvent(PlayerListener.STOPPED, new Long(getMediaTime()));
+ sendListenerEvent(PlayerListener.STOPPED, new Long(getMediaTime()));
}
}
@@ -126,7 +131,11 @@
if (state >= PREFETCHED) {
stop();
- doDeallocate();
+ try {
+ sendPlayerEvent("doDeallocate", null);
+ }
+ catch (MediaException e) {
+ }
state = REALIZED;
}
}
@@ -134,7 +143,11 @@
public synchronized void close() {
if (state > CLOSED) {
deallocate();
- doClose();
+ try {
+ sendPlayerEvent("doClose", null);
+ }
+ catch (MediaException e) {
+ }
state = CLOSED;
@@ -143,7 +156,7 @@
// stream.close();
// } catch (IOException e) { }
- sendEvent(PlayerListener.CLOSED, null);
+ sendListenerEvent(PlayerListener.CLOSED, null);
}
}
@@ -194,7 +207,7 @@
listenerList.remove(playerListener);
}
- public void sendEvent(final String evt, final Object evtData) {
+ void sendListenerEvent(final String evt, final Object evtData) {
// There's always one listener for EOM -- itself.
if (listenerList.size() > 0 || evt == PlayerListener.END_OF_MEDIA) {
@@ -238,7 +251,51 @@
}
}
+ void doPlayerEvent(final String evt, final Object evtData) throws MediaException {
+ if (evt == "doRealize") {
+ doRealize();
+ }
+ else if (evt == "doPrefetch") {
+ doPrefetch();
+ }
+ else if (evt == "doStart") {
+ doStart();
+ }
+ else if (evt == "doStop") {
+ doStop();
+ }
+ else if (evt == "doDeallocate") {
+ doDeallocate();
+ }
+ else if (evt == "doClose") {
+ doClose();
+ }
+ }
+ Throwable playerException;
+ void sendPlayerEvent(final String evt, final Object evtData) throws MediaException {
+ playerException = null;
+
+ toolKit.invokeAndWait(new Runnable() {
+ public void run() {
+ try {
+ doPlayerEvent(evt, evtData);
+ } catch (Throwable e) {
+ playerException = e;
+ }
+ }
+ });
+
+ if (playerException != null) {
+ if (playerException instanceof MediaException) {
+ throw (MediaException) playerException;
+ } else {
+ playerException.printStackTrace();
+ }
+ }
+ }
+
+
//JP /**
// * the worker method to deliver EOM event
// */
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java 2010-04-21 17:17:39 UTC (rev 812)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java 2010-04-21 17:41:30 UTC (rev 813)
@@ -1,14 +1,33 @@
package javax.microedition.media.player;
+import java.io.IOException;
+
import javax.microedition.media.Control;
import javax.microedition.media.Controllable;
import javax.microedition.media.MediaException;
import javax.microedition.media.control.VideoControl;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.hardware.Camera;
+import android.hardware.Camera.PreviewCallback;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.ViewGroup.LayoutParams;
+
+import net.yura.android.AndroidMeMIDlet;
import net.yura.android.lcdui.Toolkit;
public class CameraPlayer extends BasicPlayer implements VideoControl, Controllable {
+ private Preview preview;
+ private Camera camera;
+ private javax.microedition.lcdui.Canvas canvas;
+ private int displayX, displayY;
+ private int displayW, displayH;
+ private boolean fullScreen;
public CameraPlayer(Toolkit toolKit) {
super(toolKit);
@@ -16,20 +35,28 @@
@Override
protected void doClose() {
- // TODO Auto-generated method stub
+ if (preview != null) {
+ setVisible(false);
+ preview = null;
+ }
+ if (camera != null) {
+ camera.setPreviewCallback(null);
+ camera.stopPreview();
+ camera.release();
+ camera = null;
+ }
}
@Override
protected void doDeallocate() {
- // TODO Auto-generated method stub
-
+ // Do nothing...
}
@Override
protected Control doGetControl(String type) {
- if ("VideoControl".equalsIgnoreCase(type) ||
- "GUIControl".equalsIgnoreCase(type)) {
+ if ("javax.microedition.media.control.VideoControl".equalsIgnoreCase(type) ||
+ "javax.microedition.media.control.GUIControl".equalsIgnoreCase(type)) {
return this;
}
@@ -55,14 +82,12 @@
@Override
protected void doPrefetch() throws MediaException {
- // TODO Auto-generated method stub
-
+ // Do nothing...
}
@Override
protected void doRealize() throws MediaException {
- // TODO Auto-generated method stub
-
+ // Do nothing...
}
@Override
@@ -72,70 +97,117 @@
}
@Override
- protected boolean doStart() throws MediaException {
- // TODO Auto-generated method stub
- return false;
+ protected void doStart() throws MediaException {
+ if (preview != null && camera != null) {
+ camera.startPreview();
+ }
}
@Override
protected void doStop() {
- // TODO Auto-generated method stub
+ if (preview != null && camera != null) {
+ camera.stopPreview();
+ }
}
public int getDisplayHeight() {
- // TODO Auto-generated method stub
- return 0;
+ checkDisplayState();
+
+ return preview.getHeight();
}
public int getDisplayWidth() {
- // TODO Auto-generated method stub
- return 0;
+ checkDisplayState();
+
+ return preview.getWidth();
}
public int getDisplayX() {
- // TODO Auto-generated method stub
- return 0;
+ return displayX;
}
public int getDisplayY() {
- // TODO Auto-generated method stub
- return 0;
+ return displayY;
}
public byte[] getSnapshot(String s) throws MediaException {
+ checkDisplayState();
+
+
// TODO Auto-generated method stub
return null;
}
public int getSourceHeight() {
- // TODO Auto-generated method stub
- return 0;
+ // If we can't record video, this method is meaningless...
+ // Return screen height for now.
+ return toolKit.getScreenHeight();
}
public int getSourceWidth() {
- // TODO Auto-generated method stub
- return 0;
+ // If we can't record video, this method is meaningless...
+ // Return screen width for now.
+ return toolKit.getScreenWidth();
}
- public Object initDisplayMode(int i, Object obj) {
- // TODO Auto-generated method stub
+ public Object initDisplayMode(int mode, Object obj) {
+
+ if (preview != null) {
+ throw new IllegalStateException("initDisplayMode: called before");
+ }
+
+ if (mode != USE_DIRECT_VIDEO || !(obj instanceof javax.microedition.lcdui.Canvas)) {
+ throw new IllegalArgumentException("initDisplayMode: Only USE_DIRECT_VIDEO and Canvas are supported");
+ }
+
+ this.canvas = (javax.microedition.lcdui.Canvas) obj;
+
+ try {
+ sendPlayerEvent("doInitDisplayMode", null);
+ } catch (Exception e) {
+ }
+
+
+
return null;
}
- public void setDisplayFullScreen(boolean flag) throws MediaException {
- // TODO Auto-generated method stub
+ public void setDisplayFullScreen(boolean fullScreen) throws MediaException {
+ checkDisplayState();
+
+ if (this.fullScreen != fullScreen) {
+ this.fullScreen = fullScreen;
+
+ updateView();
+ }
}
- public void setDisplayLocation(int i, int j) {
- // TODO Auto-generated method stub
+ public void setDisplayLocation(int x, int y) {
+ checkDisplayState();
+
+ displayX = x;
+ displayY = y;
+
+ updateView();
}
- public void setDisplaySize(int i, int j) throws MediaException {
- // TODO Auto-generated method stub
+ public void setDisplaySize(int w, int h) throws MediaException {
+ checkDisplayState();
+
+ displayW = w;
+ displayH = h;
+
+ updateView();
}
public void setVisible(boolean flag) {
- // TODO Auto-generated method stub
+ checkDisplayState();
+
+ try {
+ sendPlayerEvent("doSetVisible", flag);
+ } catch (MediaException e)
+ {
+ }
}
public String getContentType() {
@@ -143,5 +215,129 @@
return null;
}
+ private void checkDisplayState() {
+ if (preview == null) {
+ throw new IllegalStateException("initDisplayMode not called yet");
+ }
+ }
+ private void updateView() {
+ if (fullScreen) {
+ preview.layout(0, 0, canvas.getWidth(), canvas.getHeight());
+ } else {
+ preview.layout(displayX, displayY, displayX + displayW, displayY + displayH);
+ }
+ }
+
+ @Override
+ void doPlayerEvent(String evt, Object evtData) throws MediaException {
+ super.doPlayerEvent(evt, evtData);
+
+ if (evt == "doInitDisplayMode") {
+ Context context = canvas.getView().getContext();
+ preview = new Preview(context);
+ preview.setLayoutParams(new LayoutParams(200, 100));
+
+ if (displayW <= 0) {
+ displayW = canvas.getWidth();
+ }
+
+ if (displayH <= 0) {
+ displayH = canvas.getHeight();
+ }
+
+ updateView();
+ }
+ else if (evt == "doSetVisible") {
+ boolean flag = (Boolean) evtData;
+ if (flag) {
+ canvas.addOverlayView(preview);
+ }
+ else {
+ canvas.removeOverlayView(preview);
+ }
+
+ System.out.println(">>>>>>>>>>>>>>> Invalidate > " + flag);
+ preview.invalidate();
+ canvas.getView().getRootView().invalidate();
+ }
+ }
+
+
+ class Preview extends SurfaceView implements SurfaceHolder.Callback, PreviewCallback {
+
+ Preview(Context context) {
+ super(context);
+
+ System.out.println(">>>> SurfaceView constructor <<<<");
+
+ // Install a SurfaceHolder.Callback so we get notified when the
+ // underlying surface is created and destroyed.
+ SurfaceHolder mHolder = getHolder();
+ mHolder.addCallback(this);
+ mHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+ }
+
+ public void surfaceCreated(SurfaceHolder holder) {
+ System.out.println(">>>> surfaceCreated <<<<");
+ }
+
+ public void surfaceDestroyed(SurfaceHolder holder) {
+
+ System.out.println(">>>> surfaceDestroyed <<<<");
+
+ camera.setPreviewCallback(null);
+ camera.stopPreview();
+ camera.release();
+ camera = null;
+ }
+
+ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
+ // Now that the size is known, set up the camera parameters and begin
+ // the preview.
+
+ System.out.println(">>>>1a surfaceChanged <<<<");
+ if (camera == null) {
+ camera = Camera.open();
+ camera.setPreviewCallback(this);
+ }
+ System.out.println(">>>>4a surfaceChanged");
+
+ System.out.println(">>>>1 surfaceChanged");
+
+ try {
+ System.out.println(">>>>2a surfaceChanged");
+ camera.setPreviewDisplay(holder);
+ System.out.println(">>>>3a surfaceChanged");
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ camera.startPreview();
+ System.out.println(">>>>2 surfaceChanged");
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ System.out.println(">>>>>>>>>>>>>>> draw");
+ super.draw(canvas);
+ Paint p = new Paint(Color.RED);
+ canvas.drawText("PREVIEW", canvas.getWidth() / 2, canvas.getHeight() / 2, p);
+ }
+
+
+ int x, y;
+ public void onPreviewFrame(byte[] data, Camera arg1) {
+ //invalidate();
+ //System.out.println("...");
+ x++;
+ y++;
+ if (x > 100) x = 1;
+ if (y > 100) y = 1;
+ super.layout(x, y, getWidth() + x, getHeight() + y);
+ //super.setPadding(x, y, 0, 0);
+ }
+ }
+
+
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-21 17:17:39 UTC (rev 812)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-21 17:41:30 UTC (rev 813)
@@ -10,9 +10,11 @@
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
+import android.view.ViewGroup.LayoutParams;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
+import android.widget.LinearLayout;
public abstract class Canvas extends Displayable {
public static final int UP = 1;
@@ -39,11 +41,16 @@
public static final int KEY_STAR = 42;
public static final int KEY_POUND = 35;
+ private LinearLayout linearLayout;
private CanvasView canvasView;
private Bitmap graphicsBitmap;
protected Canvas() {
+ this.linearLayout = new LinearLayout(AndroidMeMIDlet.DEFAULT_ACTIVITY);
this.canvasView = new CanvasView(AndroidMeMIDlet.DEFAULT_ACTIVITY);
+
+ canvasView.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+ linearLayout.addView(canvasView);
}
public void setFullScreenMode(boolean fullScreen) {
@@ -170,19 +177,19 @@
@Override
public View getView() {
- return this.canvasView;
+ return this.linearLayout;
}
@Override
public void disposeDisplayable() {
-// this.canvasView = null;
+// JP this.canvasView = null;
}
@Override
public void initDisplayable(MIDlet midlet) {
- if (this.canvasView == null) {
- this.canvasView = new CanvasView(midlet.getActivity());
- }
+// JP if (this.canvasView == null) {
+// this.canvasView = new CanvasView(midlet.getActivity());
+// }
}
protected javax.microedition.lcdui.Graphics getGraphics() {
@@ -474,4 +481,12 @@
public void setTitle(Object object) {
// TODO Auto-generated method stub
}
+
+ public void addOverlayView(View v) {
+ linearLayout.addView(v);
+ }
+
+ public void removeOverlayView(View v) {
+ linearLayout.removeView(v);
+ }
}
Modified: AndroidME/src_MIDP/javax/microedition/media/Player.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/media/Player.java 2010-04-21 17:17:39 UTC (rev 812)
+++ AndroidME/src_MIDP/javax/microedition/media/Player.java 2010-04-21 17:41:30 UTC (rev 813)
@@ -1,25 +1,25 @@
package javax.microedition.media;
public interface Player extends Controllable {
- static int CLOSED = 1;
- static int PREFETCHED = 2;
- static int REALIZED = 3;
- static int STARTED = 4;
- static long TIME_UNKNOWN = 5;
- static int UNREALIZED = 6;
-
- void addPlayerListener(PlayerListener playerListener);
+ static int CLOSED = 0;
+ static int UNREALIZED = 100;
+ static int REALIZED = 200;
+ static int PREFETCHED = 300;
+ static int STARTED = 400;
+ static long TIME_UNKNOWN = -1l;
+
+ void addPlayerListener(PlayerListener playerListener);
void close() ;
void deallocate() ;
String getContentType() ;
long getDuration() ;
- long getMediaTime();
- int getState() ;
- void prefetch() throws MediaException;
- void realize() throws MediaException;
- void removePlayerListener(PlayerListener playerListener);
- void setLoopCount(int count);
- long setMediaTime(long now) throws MediaException;
- void start() throws MediaException;
- void stop() throws MediaException;
+ long getMediaTime();
+ int getState() ;
+ void prefetch() throws MediaException;
+ void realize() throws MediaException;
+ void removePlayerListener(PlayerListener playerListener);
+ void setLoopCount(int count);
+ long setMediaTime(long now) throws MediaException;
+ void start() throws MediaException;
+ void stop() throws MediaException;
}
Modified: AndroidME/src_MIDP/javax/microedition/media/PlayerListener.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/media/PlayerListener.java 2010-04-21 17:17:39 UTC (rev 812)
+++ AndroidME/src_MIDP/javax/microedition/media/PlayerListener.java 2010-04-21 17:41:30 UTC (rev 813)
@@ -2,14 +2,14 @@
public interface PlayerListener {
static String CLOSED = "closed";
- static String DEVICE_AVAILABLE = "device available";
- static String DEVICE_UNAVAILABLE = "device unavailable";
- static String DURATION_UPDATED = "duration updated";
- static String END_OF_MEDIA = "end of media";
+ static String DEVICE_AVAILABLE = "deviceAvailable";
+ static String DEVICE_UNAVAILABLE = "deviceUnavailable";
+ static String DURATION_UPDATED = "durationUpdated";
+ static String END_OF_MEDIA = "endOfMedia";
static String ERROR = "error";
static String STARTED = "started";
static String STOPPED = "stopped";
- static String VOLUME_CHANGED = "volume changed";
+ static String VOLUME_CHANGED = "volumeChanged";
void playerUpdate(Player player, String event, Object eventData);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-22 14:45:22
|
Revision: 818
http://swingme.svn.sourceforge.net/swingme/?rev=818&view=rev
Author: janeroski
Date: 2010-04-22 14:45:16 +0000 (Thu, 22 Apr 2010)
Log Message:
-----------
Multimedia API: Rotation now working
Modified Paths:
--------------
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java 2010-04-22 14:19:36 UTC (rev 817)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java 2010-04-22 14:45:16 UTC (rev 818)
@@ -215,40 +215,47 @@
toolKit.getHandler().post(new Runnable() {
public void run() {
- if (evt == PlayerListener.END_OF_MEDIA) {
- synchronized (BasicPlayer.this) {
-//JP EOM = true;
-// loopAfterEOM = false;
+ doListenerEvent(evt, evtData);
+ }
+ });
+ }
+ }
- if (state > Player.PREFETCHED) {
- state = Player.PREFETCHED;
-
-//JP if (loopCount > 1 || loopCount == -1) {
-// loopAfterEOM = true;
-// }
- }
- }
- }
-
- synchronized (listenerList) {
- for (int i = 0; i < listenerList.size(); i++) {
- try {
- PlayerListener l = listenerList.elementAt(i);
- l.playerUpdate(BasicPlayer.this, evt, evtData);
- }
- catch (Exception e) {
- System.err.println("Error in playerUpdate: " + e);
- }
- }
- }
-
-//JP if (loopAfterEOM) {
-// doLoop();
+ void doListenerEvent(final String evt, final Object evtData) {
+//JP
+// if (evt == PlayerListener.END_OF_MEDIA) {
+//
+//
+// synchronized (BasicPlayer.this) {
+// EOM = true;
+// loopAfterEOM = false;
+//
+// if (state > Player.PREFETCHED) {
+// state = Player.PREFETCHED;
+//
+// if (loopCount > 1 || loopCount == -1) {
+// loopAfterEOM = true;
// }
+// }
+// }
+// }
+ synchronized (listenerList) {
+ for (int i = 0; i < listenerList.size(); i++) {
+ try {
+ PlayerListener l = listenerList.elementAt(i);
+ l.playerUpdate(BasicPlayer.this, evt, evtData);
}
- });
+ catch (Exception e) {
+ System.err.println("Error in playerUpdate: " + e);
+ }
+ }
}
+
+//JP if (loopAfterEOM) {
+// doLoop();
+// }
+
}
void doPlayerEvent(final String evt, final Object evtData) throws MediaException {
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java 2010-04-22 14:19:36 UTC (rev 817)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java 2010-04-22 14:45:16 UTC (rev 818)
@@ -9,7 +9,6 @@
import android.content.Context;
import android.hardware.Camera;
-import android.hardware.Camera.PreviewCallback;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.view.ViewGroup.LayoutParams;
@@ -192,6 +191,7 @@
if (this.fullScreen != fullScreen) {
this.fullScreen = fullScreen;
+ updateView();
}
}
@@ -200,6 +200,8 @@
dispX = x;
dispY = y;
+
+ updateView();
}
public void setDisplaySize(int w, int h) throws MediaException {
@@ -207,6 +209,8 @@
dispW = w;
dispH = h;
+
+ updateView();
}
public void setVisible(boolean flag) {
@@ -248,6 +252,8 @@
if (dispH <= 0) {
dispH = canvas.getHeight();
}
+
+ updateView();
}
else if (evt == "doSetVisible") {
boolean flag = (Boolean) evtData;
@@ -260,9 +266,32 @@
}
}
+ void doListenerEvent(String evt, Object evtData) {
+ if (evt == "updateView") {
+ if (preview != null) {
+ if (fullScreen) {
+ preview.layout(0, 0, canvas.getWidth(), canvas.getHeight());
+ }
+ else {
+ preview.layout(dispX, dispY, dispX + dispW, dispY + dispH);
+ }
+ }
+ }
+ else {
+ super.doListenerEvent(evt, evtData);
+ }
+ }
- class Preview extends SurfaceView implements SurfaceHolder.Callback, PreviewCallback {
+ private void updateView() {
+ if (preview != null) {
+ sendListenerEvent("updateView", null);
+ }
+ }
+
+
+ class Preview extends SurfaceView implements SurfaceHolder.Callback {
+
Preview(Context context) {
super(context);
@@ -298,7 +327,6 @@
if (camera == null) {
camera = Camera.open();
- camera.setPreviewCallback(this);
}
try {
@@ -308,14 +336,5 @@
e.printStackTrace();
}
}
-
- public void onPreviewFrame(byte[] data, Camera arg1) {
- if (fullScreen) {
- layout(0, 0, canvas.getWidth(), canvas.getHeight());
- }
- else {
- layout(dispX, dispY, dispX + dispW, dispY + dispH);
- }
- }
}
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-22 14:19:36 UTC (rev 817)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-04-22 14:45:16 UTC (rev 818)
@@ -271,6 +271,10 @@
}
if (graphicsBitmap == null) {
+
+ // Help the GC to collect any previous graphicsBitmap
+ graphics.setCanvas(null);
+
graphicsBitmap = Bitmap.createBitmap(this.getWidth(), canvasH, Bitmap.Config.ARGB_8888);
graphics.setCanvas(new android.graphics.Canvas(graphicsBitmap));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2010-04-22 21:16:35
|
Revision: 827
http://swingme.svn.sourceforge.net/swingme/?rev=827&view=rev
Author: yuranet
Date: 2010-04-22 21:16:29 +0000 (Thu, 22 Apr 2010)
Log Message:
-----------
some random methods, and why the hell not
Modified Paths:
--------------
AndroidME/fix_build.xml
AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Property Changed:
----------------
AndroidME/
Property changes on: AndroidME
___________________________________________________________________
Added: svn:ignore
+ .project
Modified: AndroidME/fix_build.xml
===================================================================
--- AndroidME/fix_build.xml 2010-04-22 21:11:44 UTC (rev 826)
+++ AndroidME/fix_build.xml 2010-04-22 21:16:29 UTC (rev 827)
@@ -3,8 +3,8 @@
<!-- Eclipse uses "bin" for its own output, so we do the same. -->
<property name="outdir" location="bin" />
- <property name="AndroidFixResourceAsStream.jar" value="/Dev/workspace_Android/AndroidFixResourceAsStream/lib/AndroidFixResourceAsStream.jar" />
-
+ <property name="AndroidFixResourceAsStream.jar" value="lib/AndroidFixResourceAsStream.jar" />
+
<target name="fix-build">
<echo>Fixing build....</echo>
<echo message="ClassPath: ${AndroidFixResourceAsStream.jar}"/>
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java 2010-04-22 21:11:44 UTC (rev 826)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Graphics.java 2010-04-22 21:16:29 UTC (rev 827)
@@ -399,4 +399,8 @@
canvas.drawBitmap(rgbData, offset, scanlength, x, y, width, height, processAlpha, null);
}
+
+ public void scale(double sx, double sy) {
+ canvas.scale((float)sx, (float)sy);
+ }
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2010-04-22 21:11:44 UTC (rev 826)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2010-04-22 21:16:29 UTC (rev 827)
@@ -215,4 +215,8 @@
public boolean isMutable() {
return bitmap.isMutable();
}
+
+ public void setRGB(int x,int y,int color) {
+ bitmap.setPixel(x, y, color);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2010-04-26 14:02:16
|
Revision: 837
http://swingme.svn.sourceforge.net/swingme/?rev=837&view=rev
Author: yuranet
Date: 2010-04-26 14:02:10 +0000 (Mon, 26 Apr 2010)
Log Message:
-----------
getResourceAsStream fix
Modified Paths:
--------------
AndroidME/fix_build.xml
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
Modified: AndroidME/fix_build.xml
===================================================================
--- AndroidME/fix_build.xml 2010-04-26 13:12:34 UTC (rev 836)
+++ AndroidME/fix_build.xml 2010-04-26 14:02:10 UTC (rev 837)
@@ -3,7 +3,7 @@
<!-- Eclipse uses "bin" for its own output, so we do the same. -->
<property name="outdir" location="bin" />
- <property name="AndroidFixResourceAsStream.jar" value="lib/AndroidFixResourceAsStream.jar" />
+ <property name="AndroidFixResourceAsStream.jar" value="../AndroidME/lib/AndroidFixResourceAsStream.jar" />
<target name="fix-build">
<echo>Fixing build....</echo>
Modified: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-26 13:12:34 UTC (rev 836)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-26 14:02:10 UTC (rev 837)
@@ -386,7 +386,19 @@
if (name.startsWith("/")) {
name = name.substring(1);
}
-
+ else {
+ return origClass.getResourceAsStream(name);
+ }
+/*
+ // THIS DOES NOT WORK
+ else {
+ String dir = origClass.getName();
+ dir = dir.substring(0, dir.lastIndexOf('.')+1 );
+ dir = dir.replace('.', '/');
+ name = dir+name;
+System.out.println("name="+name);
+ }
+*/
is = DEFAULT_ACTIVITY.getAssets().open(name);
} catch (Throwable e) {
// e.printStackTrace();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-27 12:53:56
|
Revision: 841
http://swingme.svn.sourceforge.net/swingme/?rev=841&view=rev
Author: janeroski
Date: 2010-04-27 12:53:48 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Bluetooth: First release
- Add just enough code to be able to get the list of surrounding devices
- Support for Android 1.6 and 2.0
Modified Paths:
--------------
AndroidME/AndroidManifest.xml
AndroidME/AndroidTODO.txt
AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/DiscoveryAgent.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/RemoteDevice.java
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
Added Paths:
-----------
AndroidME/src_Android/net/yura/android/bluetooth/
AndroidME/src_Android/net/yura/android/bluetooth/BluetoothManager.java
AndroidME/src_JSR82_Bluetooth/android/
AndroidME/src_JSR82_Bluetooth/android/bluetooth/
AndroidME/src_JSR82_Bluetooth/android/bluetooth/BluetoothAdapter.java
AndroidME/src_JSR82_Bluetooth/android/bluetooth/BluetoothDevice.java
AndroidME/src_JSR82_Bluetooth/android/bluetooth/IBluetoothDeviceCallback.java
AndroidME/src_JSR82_Bluetooth/it/
AndroidME/src_JSR82_Bluetooth/it/gerdavax/
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothDevice.java
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothException.java
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothSocket.java
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/LocalBluetoothDevice.java
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/LocalBluetoothDeviceListener.java
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/RemoteBluetoothDevice.java
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/RemoteBluetoothDeviceListener.java
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/util/
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/util/PlatformChecker.java
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/util/ReflectionUtils.java
AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/util/Scout.java
Modified: AndroidME/AndroidManifest.xml
===================================================================
--- AndroidME/AndroidManifest.xml 2010-04-26 18:33:45 UTC (rev 840)
+++ AndroidME/AndroidManifest.xml 2010-04-27 12:53:48 UTC (rev 841)
@@ -24,5 +24,7 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
- <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.BLUETOOTH" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
</manifest>
\ No newline at end of file
Modified: AndroidME/AndroidTODO.txt
===================================================================
--- AndroidME/AndroidTODO.txt 2010-04-26 18:33:45 UTC (rev 840)
+++ AndroidME/AndroidTODO.txt 2010-04-27 12:53:48 UTC (rev 841)
@@ -1,9 +1,10 @@
-- Blue tooth
+- setCurrentDisplay to null, should set app to background
- SMS
- Photo browser being able to go to next and previous image
--- DONE ---
+- Blue tooth
- Camera
- PIM 2 versions (on Android 2.* uses the deprecated API from 1.6, but can read/write contacts)
- Location: cellId, MMC, etc
Modified: AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-26 18:33:45 UTC (rev 840)
+++ AndroidME/src_Android/net/yura/android/AndroidMeMIDlet.java 2010-04-27 12:53:48 UTC (rev 841)
@@ -166,6 +166,9 @@
System.setProperty("microedition.pim.version", "1.0");
System.setProperty("microedition.io.file.FileConnection.version", "1.0");
+ // BlueTooth
+ System.setProperty("bluetooth.api.version", "1.1");
+
try {
String[] assetList = getResources().getAssets().list("");
for (int i = 0; i < assetList.length; i++) {
Added: AndroidME/src_Android/net/yura/android/bluetooth/BluetoothManager.java
===================================================================
--- AndroidME/src_Android/net/yura/android/bluetooth/BluetoothManager.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/bluetooth/BluetoothManager.java 2010-04-27 12:53:48 UTC (rev 841)
@@ -0,0 +1,214 @@
+package net.yura.android.bluetooth;
+
+import java.util.ArrayList;
+
+import it.gerdavax.android.bluetooth.LocalBluetoothDevice;
+import it.gerdavax.android.bluetooth.LocalBluetoothDeviceListener;
+import it.gerdavax.android.bluetooth.RemoteBluetoothDevice;
+
+import javax.bluetooth.DeviceClass;
+import javax.bluetooth.DiscoveryListener;
+import javax.bluetooth.RemoteDevice;
+
+import net.yura.android.AndroidMeMIDlet;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+public class BluetoothManager {
+
+ // Intent request codes
+ private static final int REQUEST_ENABLE_BT = 2;
+
+ private static BluetoothManager instance;
+
+ private DiscoveryListener listener;
+ private Activity activity;
+ private EventReceiver_2_0 eventReceiver_2_0;
+ private EventReceiver_1_6 eventReceiver_1_6;
+ private LocalBluetoothDevice localBT;
+
+
+ public LocalBluetoothDevice getBluetoothDevice() {
+ return localBT;
+ }
+
+ public static BluetoothManager getBluetoothManager() {
+ if (instance == null) {
+ instance = new BluetoothManager(AndroidMeMIDlet.DEFAULT_ACTIVITY);
+
+ // Attempt to use older Bluetooth Android 1.6 API's
+ // If it failed, attempt Bluetooth Android 2.0 API's
+ try {
+ instance.start_1_6();
+ } catch (Exception e) {
+ e.printStackTrace();
+
+ instance.start_2_0();
+ }
+ }
+
+ return instance;
+ }
+
+ private BluetoothManager(Activity activity) {
+
+ this.activity = activity;
+ }
+
+ private void start_1_6() throws Exception {
+ // If we are not running on Android 1.6, this will fail
+ localBT = LocalBluetoothDevice.initLocalDevice(activity);
+ System.out.println("localBT = " + localBT);
+
+ eventReceiver_1_6 = new EventReceiver_1_6();
+ localBT.setListener(eventReceiver_1_6);
+
+ // TODO: When should enable be done?
+ localBT.setEnabled(true);
+ System.out.println(">>> isEnabled = " + localBT.isEnabled());
+ }
+
+ private void start_2_0() {
+ eventReceiver_2_0 = new EventReceiver_2_0();
+
+ // Get local Bluetooth adapter
+ BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+
+ // Register for broadcasts when a device is discovered
+ IntentFilter filter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
+ activity.registerReceiver(eventReceiver_2_0, filter);
+
+ // Register for broadcasts when discovery has finished
+ filter = new IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
+ activity.registerReceiver(eventReceiver_2_0, filter);
+
+ // If BT is not on, request that it be enabled.
+ if (!mBluetoothAdapter.isEnabled()) {
+ // Set result CANCELED in case the user backs out
+ activity.setResult(Activity.RESULT_CANCELED);
+
+ Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+ activity.startActivityForResult(enableIntent, REQUEST_ENABLE_BT);
+ }
+ }
+
+
+ // TODO: This should be called when the activity is paused...
+ public void stop() {
+ if (eventReceiver_2_0 != null) {
+ activity.unregisterReceiver(eventReceiver_2_0);
+ }
+ if (eventReceiver_1_6 != null) {
+ // TODO: Is cancel enough?
+ }
+ }
+
+ public void setDiscoveryListener(DiscoveryListener listener) {
+ this.listener = listener;
+ }
+
+
+ // Listener for Bluetooth Android 1.6 API's
+ class EventReceiver_1_6 implements LocalBluetoothDeviceListener {
+ public void bluetoothDisabled() {
+ System.out.println(">>>> bluetoothDisabled");
+ }
+
+ public void bluetoothEnabled() {
+ System.out.println(">>>> bluetoothEnabled");
+ }
+
+ public void deviceFound(String deviceAddress) {
+ System.out.println(">>>> deviceFound: " + deviceAddress);
+
+ if (listener != null) {
+ try {
+ RemoteBluetoothDevice r = localBT.getRemoteBluetoothDevice(deviceAddress);
+ RemoteDevice btDevice = new RemoteDevice(deviceAddress, r.getName());
+
+ // TODO: Get device class... For now everything is a Mobile Phone
+ DeviceClass deviceClass = new DeviceClass(0x200);
+
+ listener.deviceDiscovered(btDevice, deviceClass);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public void scanCompleted(ArrayList<String> devices) {
+ System.out.println(">>>> scanCompleted");
+
+ if (listener != null) {
+ // TODO: add the right discType
+ listener.inquiryCompleted(DiscoveryListener.SERVICE_SEARCH_COMPLETED);
+ }
+ }
+
+ public void scanStarted() {
+ System.out.println(">>>> scanStarted");
+ }
+ }
+
+
+ // Listener for Bluetooth Android 2.0 API's
+ class EventReceiver_2_0 extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+
+ System.out.println(">>> onReceive: " + intent.getAction());
+
+ if (listener == null) {
+ return;
+ }
+
+ String action = intent.getAction();
+ if (BluetoothAdapter.ACTION_REQUEST_ENABLE.equals(action)) {
+ System.out.println(">>>> ACTION_REQUEST_ENABLE " + getResultCode());
+
+ // Android 1.6 code
+// switch (requestCode) {
+ //
+// case REQUEST_ENABLE_BT:
+// // When the request to enable Bluetooth returns
+// if (mBluetoothAdapter.isEnabled()) {
+// System.out.println("BT enabled!");
+ //
+ //
+// } else {
+// // User did not enable Bluetooth or an error occured
+// System.out.println("BT not enabled");
+// Toast.makeText(this, R.string.bt_not_enabled_leaving, Toast.LENGTH_LONG).show();
+// finish();
+// }
+// }
+ }
+ else if (BluetoothDevice.ACTION_FOUND.equals(action)) {
+
+ // Get the BluetoothDevice object from the Intent
+ BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+ RemoteDevice btDevice = new RemoteDevice(device.getAddress(), device.getName());
+
+ // TODO: Get device class... For now everything is a Mobile Phone
+ DeviceClass deviceClass = new DeviceClass(0x200);
+
+ if (listener != null) {
+ listener.deviceDiscovered(btDevice, deviceClass);
+ }
+ }
+ else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) {
+
+ if (listener != null) {
+ // TODO: add the right discType
+ listener.inquiryCompleted(DiscoveryListener.SERVICE_SEARCH_COMPLETED);
+ }
+ }
+ }
+ }
+}
Added: AndroidME/src_JSR82_Bluetooth/android/bluetooth/BluetoothAdapter.java
===================================================================
--- AndroidME/src_JSR82_Bluetooth/android/bluetooth/BluetoothAdapter.java (rev 0)
+++ AndroidME/src_JSR82_Bluetooth/android/bluetooth/BluetoothAdapter.java 2010-04-27 12:53:48 UTC (rev 841)
@@ -0,0 +1,91 @@
+package android.bluetooth;
+
+
+import net.yura.android.bluetooth.BluetoothManager;
+import it.gerdavax.android.bluetooth.LocalBluetoothDevice;
+
+public class BluetoothAdapter {
+
+ public static final String ACTION_DISCOVERY_FINISHED = "android.bluetooth.adapter.action.DISCOVERY_FINISHED";
+ public static final String ACTION_REQUEST_ENABLE = "android.bluetooth.adapter.action.REQUEST_ENABLE";
+
+ private static BluetoothAdapter instance;
+
+ private LocalBluetoothDevice localBT;
+
+ private BluetoothAdapter(LocalBluetoothDevice localBT) {
+ this.localBT = localBT;
+ }
+
+ public static BluetoothAdapter getDefaultAdapter() {
+ if (instance == null) {
+ LocalBluetoothDevice localBT = BluetoothManager.getBluetoothManager().getBluetoothDevice();
+ if (localBT == null) {
+ throw new RuntimeException("BluetoothAdapter not initialized");
+ }
+
+ instance = new BluetoothAdapter(localBT);
+ }
+
+ return instance;
+ }
+
+ public boolean isEnabled() {
+ try {
+ return localBT.isEnabled();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return false;
+ }
+
+ public boolean isDiscovering() {
+ try {
+ return localBT.isScanning();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return false;
+ }
+
+ public boolean cancelDiscovery () {
+ try {
+ localBT.stopScanning();
+ return true;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return false;
+ }
+
+ public String getName() {
+ try {
+ return localBT.getName();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public String getAddress() {
+ try {
+ return localBT.getAddress();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public boolean startDiscovery () {
+ try {
+ localBT.scan();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return true;
+ }
+}
Added: AndroidME/src_JSR82_Bluetooth/android/bluetooth/BluetoothDevice.java
===================================================================
--- AndroidME/src_JSR82_Bluetooth/android/bluetooth/BluetoothDevice.java (rev 0)
+++ AndroidME/src_JSR82_Bluetooth/android/bluetooth/BluetoothDevice.java 2010-04-27 12:53:48 UTC (rev 841)
@@ -0,0 +1,27 @@
+package android.bluetooth;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class BluetoothDevice implements Parcelable {
+
+ public static final String ACTION_FOUND = "android.bluetooth.device.action.FOUND";
+ public static final String EXTRA_DEVICE = "android.bluetooth.device.extra.DEVICE";
+ public String getName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public String getAddress() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public int describeContents() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public void writeToParcel(Parcel arg0, int arg1) {
+ // TODO Auto-generated method stub
+
+ }
+}
Added: AndroidME/src_JSR82_Bluetooth/android/bluetooth/IBluetoothDeviceCallback.java
===================================================================
--- AndroidME/src_JSR82_Bluetooth/android/bluetooth/IBluetoothDeviceCallback.java (rev 0)
+++ AndroidME/src_JSR82_Bluetooth/android/bluetooth/IBluetoothDeviceCallback.java 2010-04-27 12:53:48 UTC (rev 841)
@@ -0,0 +1,94 @@
+/*
+ * This file is auto-generated. DO NOT MODIFY.
+ * Original file: /Users/gerdavax/Documents/workspace/AndroidBluetoothLibrarySamples/src/android/bluetooth/IBluetoothDeviceCallback.aidl
+ */
+package android.bluetooth;
+
+//import java.lang.String;
+//import android.os.RemoteException;
+import android.os.IBinder;
+//import android.os.IInterface;
+//import android.os.Binder;
+//import android.os.Parcel;
+
+public interface IBluetoothDeviceCallback extends android.os.IInterface {
+ /** Local-side IPC implementation stub class. */
+ public static abstract class Stub extends android.os.Binder implements android.bluetooth.IBluetoothDeviceCallback {
+ private static final java.lang.String DESCRIPTOR = "android.bluetooth.IBluetoothDeviceCallback";
+
+ /** Construct the stub at attach it to the interface. */
+ public Stub() {
+ this.attachInterface(this, DESCRIPTOR);
+ }
+
+ /**
+ * Cast an IBinder object into an IBluetoothDeviceCallback interface,
+ * generating a proxy if needed.
+ */
+ public static android.bluetooth.IBluetoothDeviceCallback asInterface(android.os.IBinder obj) {
+ if ((obj == null)) {
+ return null;
+ }
+ android.os.IInterface iin = (android.os.IInterface) obj.queryLocalInterface(DESCRIPTOR);
+ if (((iin != null) && (iin instanceof android.bluetooth.IBluetoothDeviceCallback))) {
+ return ((android.bluetooth.IBluetoothDeviceCallback) iin);
+ }
+ return new android.bluetooth.IBluetoothDeviceCallback.Stub.Proxy(obj);
+ }
+
+ public android.os.IBinder asBinder() {
+ return this;
+ }
+
+ public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException {
+ switch (code) {
+ case INTERFACE_TRANSACTION: {
+ reply.writeString(DESCRIPTOR);
+ return true;
+ }
+ case TRANSACTION_onGetRemoteServiceChannelResult: {
+ data.enforceInterface(DESCRIPTOR);
+ java.lang.String _arg0;
+ _arg0 = data.readString();
+ int _arg1;
+ _arg1 = data.readInt();
+ this.onGetRemoteServiceChannelResult(_arg0, _arg1);
+ return true;
+ }
+ }
+ return super.onTransact(code, data, reply, flags);
+ }
+
+ private static class Proxy implements android.bluetooth.IBluetoothDeviceCallback {
+ private android.os.IBinder mRemote;
+
+ Proxy(android.os.IBinder remote) {
+ mRemote = remote;
+ }
+
+ public android.os.IBinder asBinder() {
+ return mRemote;
+ }
+
+ public java.lang.String getInterfaceDescriptor() {
+ return DESCRIPTOR;
+ }
+
+ public void onGetRemoteServiceChannelResult(java.lang.String address, int channel) throws android.os.RemoteException {
+ android.os.Parcel _data = android.os.Parcel.obtain();
+ try {
+ _data.writeInterfaceToken(DESCRIPTOR);
+ _data.writeString(address);
+ _data.writeInt(channel);
+ mRemote.transact(Stub.TRANSACTION_onGetRemoteServiceChannelResult, _data, null, IBinder.FLAG_ONEWAY);
+ } finally {
+ _data.recycle();
+ }
+ }
+ }
+
+ static final int TRANSACTION_onGetRemoteServiceChannelResult = (IBinder.FIRST_CALL_TRANSACTION + 0);
+ }
+
+ public void onGetRemoteServiceChannelResult(java.lang.String address, int channel) throws android.os.RemoteException;
+}
Added: AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothDevice.java
===================================================================
--- AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothDevice.java (rev 0)
+++ AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothDevice.java 2010-04-27 12:53:48 UTC (rev 841)
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2009 Stefano Sanna
+ *
+ * ger...@gm... - http://www.gerdavax.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package it.gerdavax.android.bluetooth;
+
+/**
+ * This interface define common methods and Bluetooth constants for local and
+ * remote Bluetooth devices.
+ *
+ * @author Stefano Sanna - ger...@gm... - http://www.gerdavax.it
+ * @since 0.2
+ */
+public interface BluetoothDevice {
+
+ /**
+ *
+ * @author Stefano Sanna - ger...@gm...
+ * @since 0.2
+ */
+ public static final class BluetoothProfiles {
+ /**
+ * UUID for Serial Port Profile (SPP)
+ */
+ public static final int UUID_SERIAL_PORT_PROFILE = 0x1101;
+
+ /**
+ * Dial-up Networking - LAN access via PPP
+ */
+ public static final int UUID_DUN_PPP_PROFILE = 0x1102;
+ // Dial-up Networking
+ public static final int UUID_DUNP_PROFILE = 0x1103;
+ public static final int UUID_OBEX_OBJECT_PUSH_PROFILE = 0x1105;
+ public static final int UUID_OBEX_FTP_PROFILE = 0x1106;
+ public static final int UUID_CORDLESS_TELEPHONY_PROFILE = 0x1109;
+ public static final int UUID_AV_REMOTE_CONTROLLER_PROFILE = 0x110E;
+ public static final int UUID_FAX_PROFILE = 0x1111;
+ public static final int UUID_GA_HEADSET_PROFILE = 0x1108;
+ public static final int UUID_GA_HEADSET_AUDIO_GATEWAY_PROFILE = 0x1112;
+ public static final int UUID_HANDSFREE_PROFILE = 0x111E;
+ public static final int UUID_HANDSFREE_AUDIO_GATEWAY_PROFILE = 0x111F;
+ public static final int UUID_BASIC_PRINTING_PROFILE = 0x1122;
+ public static final int UUID_BASIC_PRINTING_STATUS_PROFILE = 0x1123;
+ public static final int UUID_HARDCOPY_CABLE_REPLACEMENT_PROFILE = 0x1125;
+ public static final int UUID_HARDCOPY_CABLE_REPLACEMENT_PRINT_PROFILE = 0x1126;
+ public static final int UUID_HARDCOPY_CABLE_REPLACEMENT_SCAN_PROFILE = 0x1127;
+ public static final int UUID_HUMAN_DEVICE_INTERFACE_PROFILE = 0x1124;
+ }
+
+ public static final class BluetoothClasses {
+ public static final int SERVICE_MAJOR_CLASS_INFORMATION = 0x800000;
+ public static final int SERVICE_MAJOR_CLASS_TELEPHONY = 0x400000;
+ public static final int SERVICE_MAJOR_CLASS_AUDIO = 0x200000;
+ public static final int SERVICE_MAJOR_CLASS_OBEX = 0x100000;
+ public static final int SERVICE_MAJOR_CLASS_CAPTURE = 0x080000;
+ public static final int SERVICE_MAJOR_CLASS_RENDER = 0x040000;
+ public static final int SERVICE_MAJOR_CLASS_NETWORK = 0x020000;
+ public static final int SERVICE_MAJOR_CLASS_POSITION = 0x010000;
+
+ public static final int DEVICE_MAJOR_COMPUTER = 256;
+ public static final int DEVICE_MAJOR_PHONE = 512;
+ public static final int DEVICE_MAJOR_LAN = 768;
+ public static final int DEVICE_MAJOR_AV = 1024;
+ public static final int DEVICE_MAJOR_PERIPHERAL = 1280;
+ public static final int DEVICE_MAJOR_IMAGING = 1536;
+ public static final int DEVICE_MAJOR_UNCLASSIFIED = 7936;
+
+ public static final int DEVICE_MINOR_COMPUTER_MISC = 0;
+ public static final int DEVICE_MINOR_COMPUTER_DESKTOP = 4;
+ public static final int DEVICE_MINOR_COMPUTER_SERVER = 8;
+ public static final int DEVICE_MINOR_COMPUTER_LAPTOP = 12;
+ public static final int DEVICE_MINOR_COMPUTER_SUBLAPTOP = 16;
+ public static final int DEVICE_MINOR_COMPUTER_PDA = 20;
+ public static final int DEVICE_MINOR_COMPUTER_WATCH_SIZE = 24;
+ public static final int DEVICE_MINOR_PHONE_MISC = 0;
+ public static final int DEVICE_MINOR_PHONE_CELLULAR = 4;
+ public static final int DEVICE_MINOR_PHONE_CORDLESS = 8;
+ public static final int DEVICE_MINOR_PHONE_SMARTPHONE = 12;
+ public static final int DEVICE_MINOR_PHONE_MODEM = 16;
+ }
+
+ public static final class BluetoothProtocols {
+ public static final int PROTOCOL_SDP = 0x0001;
+ public static final int PROTOCOL_UDP = 0x0002;
+ public static final int PROTOCOL_RFCOMM = 0x0003;
+ public static final int PROTOCOL_TCP = 0x0004;
+ public static final int PROTOCOL_TCS_BIN = 0x0005;
+ public static final int PROTOCOL_OBEX = 0x0008;
+ public static final int PROTOCOL_IP = 0x0009;
+ public static final int PROTOCOL_FTP = 0x000a;
+ public static final int PROTOCOL_HTTP = 0x000c;
+ public static final int PROTOCOL_BNEP = 0x000f;
+ public static final int PROTOCOL_L2CAP = 0x0100;
+ }
+
+ /**
+ * Gets the friendly name associated to this Bluetooth device. For remote
+ * devices, friendly name could be not immediately retrieved by the
+ * Bluetooth service when the remote device is discovered
+ *
+ * @return the friendly name of the device
+ * @since 0.2
+ */
+ public String getName() throws BluetoothException;
+
+ /**
+ * Gets the BD Address of this device.
+ *
+ * @return the BD Address
+ * @since 0.2
+ */
+ public String getAddress() throws BluetoothException;
+
+}
Added: AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothException.java
===================================================================
--- AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothException.java (rev 0)
+++ AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothException.java 2010-04-27 12:53:48 UTC (rev 841)
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2009 Stefano Sanna
+ *
+ * ger...@gm... - http://www.gerdavax.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package it.gerdavax.android.bluetooth;
+
+/**
+ * Signals a general, Bluetooth-related error.
+ *
+ * @author Stefano Sanna - ger...@gm... - http://www.gerdavax.it
+ * @since 0.3
+ */
+public class BluetoothException extends Exception {
+
+ private static final long serialVersionUID = -2281359045593775915L;
+
+ /**
+ * Constructs a new BluetoothException with the specified cause
+ *
+ * @param t
+ * the cause (which is saved for later retrieval by the
+ * Throwable.getCause() method). (A null value is permitted, and
+ * indicates that the cause is nonexistent or unknown.)
+ */
+ public BluetoothException(Throwable t) {
+ super(t);
+ }
+
+ /**
+ * Constructs an BluetoothException with given error detail message.
+ */
+ public BluetoothException(String message) {
+ super(message);
+ }
+
+ /**
+ * Constructs a new exception with the specified cause and a detail message
+ * of (cause==null ? null : cause.toString()) (which typically contains the
+ * class and detail message of cause).
+ *
+ * @param message
+ * the detail message (which is saved for later retrieval by the
+ * Throwable.getMessage() method).
+ * @param t
+ * the cause (which is saved for later retrieval by the
+ * Throwable.getCause() method). (A null value is permitted, and
+ * indicates that the cause is nonexistent or unknown.)
+ */
+ public BluetoothException(String message, Throwable t) {
+ super(message, t);
+ }
+
+}
Added: AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothSocket.java
===================================================================
--- AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothSocket.java (rev 0)
+++ AndroidME/src_JSR82_Bluetooth/it/gerdavax/android/bluetooth/BluetoothSocket.java 2010-04-27 12:53:48 UTC (rev 841)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2009 Stefano Sanna
+ *
+ * ger...@gm... - http://www.gerdavax.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package it.gerdavax.android.bluetooth;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * This interfaces models a RFComm connection to an assigned port to to a remote
+ * device. BluetoothSocket instances are obtained invoking public
+ * BluetoothSocket openSocket(int port) method on RemoteBluetoothDevice
+ *
+ * @author Stefano Sanna - ger...@gm... - http://www.gerdavax.it
+ *
+ */
+public interface BluetoothSocket {
+
+ /**
+ * Gets the RemoteBluetoothDevice instance that owns this socket
+ *
+ * @return the RemoteBluetoothDevice which opened this socket
+ */
+ public RemoteBluetoothDevice getRemoteBluetoothDevice();
+
+ /**
+ * Gets the remote port (channel) connected through this socket
+ *
+ * @return the port to which this socket is connected
+ */
+ public int getPort();
+
+ /**
+ * Gets the InputStream
+ *
+ * @return the InputStream of this socket
+ * @throws Exception
+ */
+ public InputStream getInputStream() throws Exception;
+
+ /**
+ ...
[truncated message content] |
|
From: <jan...@us...> - 2010-04-27 15:22:52
|
Revision: 844
http://swingme.svn.sourceforge.net/swingme/?rev=844&view=rev
Author: janeroski
Date: 2010-04-27 15:22:46 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
Bluetooth: Uncaught exception on emulator
- If hardware is not supported don't let APPs get and instance of LocalDevice
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/bluetooth/BluetoothManager.java
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java
Modified: AndroidME/src_Android/net/yura/android/bluetooth/BluetoothManager.java
===================================================================
--- AndroidME/src_Android/net/yura/android/bluetooth/BluetoothManager.java 2010-04-27 15:04:15 UTC (rev 843)
+++ AndroidME/src_Android/net/yura/android/bluetooth/BluetoothManager.java 2010-04-27 15:22:46 UTC (rev 844)
@@ -43,11 +43,10 @@
instance = new BluetoothManager(AndroidMeMIDlet.DEFAULT_ACTIVITY);
// Attempt to use older Bluetooth Android 1.6 API's
- // If it failed, attempt Bluetooth Android 2.0 API's
+ // If it fails, attempt Android 2.0 API's
try {
instance.start_1_6();
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (Throwable e) {
instance.start_2_0();
}
@@ -62,6 +61,8 @@
}
private void start_1_6() throws Exception {
+ System.out.println(">>> Bluetooth trying 1.6 API...");
+
// If we are not running on Android 1.6, this will fail
localBT = LocalBluetoothDevice.initLocalDevice(activity);
System.out.println("localBT = " + localBT);
@@ -75,6 +76,8 @@
}
private void start_2_0() {
+ System.out.println(">>> Bluetooth trying 2.0 API...");
+
eventReceiver_2_0 = new EventReceiver_2_0();
// Get local Bluetooth adapter
Modified: AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java
===================================================================
--- AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java 2010-04-27 15:04:15 UTC (rev 843)
+++ AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java 2010-04-27 15:22:46 UTC (rev 844)
@@ -53,10 +53,18 @@
*/
public static LocalDevice getLocalDevice() throws BluetoothStateException {
- if (deviceInstance == null) {
- deviceInstance = new LocalDevice();
- }
+ try {
+ // Make sure we have a valid BluetoothAdapter...
+ BluetoothAdapter.getDefaultAdapter();
+
+ if (deviceInstance == null) {
+ deviceInstance = new LocalDevice();
+ }
+ } catch (Throwable e) {
+ throw new BluetoothStateException(e.getMessage());
+ }
+
return deviceInstance;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-28 08:49:00
|
Revision: 846
http://swingme.svn.sourceforge.net/swingme/?rev=846&view=rev
Author: janeroski
Date: 2010-04-28 08:48:54 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
Bluetooth: Uncaught exception on emulator (2.0/2.1)
- If hardware is not supported don't let APPs get and instance of LocalDevice
Modified Paths:
--------------
AndroidME/AndroidTODO.txt
AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java
Modified: AndroidME/AndroidTODO.txt
===================================================================
--- AndroidME/AndroidTODO.txt 2010-04-27 21:09:05 UTC (rev 845)
+++ AndroidME/AndroidTODO.txt 2010-04-28 08:48:54 UTC (rev 846)
@@ -1,9 +1,8 @@
-- setCurrentDisplay to null, should set app to background
- SMS
- Photo browser being able to go to next and previous image
-
--- DONE ---
+- setCurrentDisplay to null, should set app to background
- Blue tooth
- Camera
- PIM 2 versions (on Android 2.* uses the deprecated API from 1.6, but can read/write contacts)
Modified: AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java
===================================================================
--- AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java 2010-04-27 21:09:05 UTC (rev 845)
+++ AndroidME/src_JSR82_Bluetooth/javax/bluetooth/LocalDevice.java 2010-04-28 08:48:54 UTC (rev 846)
@@ -12,6 +12,8 @@
import android.bluetooth.BluetoothAdapter;
import javax.microedition.io.Connection;
+import net.yura.android.bluetooth.BluetoothManager;
+
/**
* The <code>LocalDevice</code> class defines the basic functions of the
* Bluetooth manager. The
@@ -55,8 +57,9 @@
try {
- // Make sure we have a valid BluetoothAdapter...
+ // Make sure we have a valid BluetoothAdapter and BluetoothManager...
BluetoothAdapter.getDefaultAdapter();
+ BluetoothManager.getBluetoothManager();
if (deviceInstance == null) {
deviceInstance = new LocalDevice();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-04-28 15:27:12
|
Revision: 855
http://swingme.svn.sourceforge.net/swingme/?rev=855&view=rev
Author: janeroski
Date: 2010-04-28 15:27:05 +0000 (Wed, 28 Apr 2010)
Log Message:
-----------
SMS: Add new implementation
Modified Paths:
--------------
AndroidME/AndroidManifest.xml
AndroidME/src_Android/net/yura/android/io/socket/SocketConnection.java
AndroidME/src_MIDP/javax/microedition/io/Connector.java
AndroidME/src_Test/net/yura/android/MainTest.java
Added Paths:
-----------
AndroidME/src_Android/net/yura/android/messaging/
AndroidME/src_Android/net/yura/android/messaging/BinaryMessageImpl.java
AndroidME/src_Android/net/yura/android/messaging/MessageConnectionImpl.java
AndroidME/src_Android/net/yura/android/messaging/MessageImpl.java
AndroidME/src_Android/net/yura/android/messaging/TextMessageImpl.java
Modified: AndroidME/AndroidManifest.xml
===================================================================
--- AndroidME/AndroidManifest.xml 2010-04-28 14:21:22 UTC (rev 854)
+++ AndroidME/AndroidManifest.xml 2010-04-28 15:27:05 UTC (rev 855)
@@ -26,5 +26,6 @@
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.BLUETOOTH" />
- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+ <uses-permission android:name="android.permission.SEND_SMS" />
</manifest>
\ No newline at end of file
Modified: AndroidME/src_Android/net/yura/android/io/socket/SocketConnection.java
===================================================================
--- AndroidME/src_Android/net/yura/android/io/socket/SocketConnection.java 2010-04-28 14:21:22 UTC (rev 854)
+++ AndroidME/src_Android/net/yura/android/io/socket/SocketConnection.java 2010-04-28 15:27:05 UTC (rev 855)
@@ -31,8 +31,6 @@
import java.io.OutputStream;
import java.net.Socket;
-import javax.microedition.io.StreamConnection;
-
public class SocketConnection implements javax.microedition.io.SocketConnection {
protected Socket socket;
Added: AndroidME/src_Android/net/yura/android/messaging/BinaryMessageImpl.java
===================================================================
--- AndroidME/src_Android/net/yura/android/messaging/BinaryMessageImpl.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/messaging/BinaryMessageImpl.java 2010-04-28 15:27:05 UTC (rev 855)
@@ -0,0 +1,29 @@
+package net.yura.android.messaging;
+
+import java.util.Date;
+
+import javax.wireless.messaging.BinaryMessage;
+
+/**
+ * Provides BinaryMessage functionalities.
+ */
+public class BinaryMessageImpl extends MessageImpl implements BinaryMessage {
+
+ private byte[] payloadData;
+
+ public BinaryMessageImpl(String address) {
+ this(address, null);
+ }
+
+ public BinaryMessageImpl(String address, Date timestamp) {
+ super(address, timestamp);
+ }
+
+ public byte[] getPayloadData() {
+ return this.payloadData;
+ }
+
+ public void setPayloadData(byte[] payloadData) {
+ this.payloadData = payloadData;
+ }
+}
Added: AndroidME/src_Android/net/yura/android/messaging/MessageConnectionImpl.java
===================================================================
--- AndroidME/src_Android/net/yura/android/messaging/MessageConnectionImpl.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/messaging/MessageConnectionImpl.java 2010-04-28 15:27:05 UTC (rev 855)
@@ -0,0 +1,172 @@
+package net.yura.android.messaging;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.util.ArrayList;
+import java.util.Date;
+
+import javax.wireless.messaging.BinaryMessage;
+import javax.wireless.messaging.Message;
+import javax.wireless.messaging.MessageConnection;
+import javax.wireless.messaging.MessageListener;
+import javax.wireless.messaging.TextMessage;
+
+import net.yura.android.AndroidMeMIDlet;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.telephony.SmsManager;
+import android.telephony.SmsMessage;
+
+/**
+ * Provides MessageConnection functionalities. Note: <uses-permission
+ * id="android.permission.RECEIVE_SMS" /> is required for receiving SMS Note 2:
+ * when using the PushRegistry, we could register the service the Manifest.xml
+ * as well.
+ */
+public class MessageConnectionImpl extends BroadcastReceiver implements MessageConnection {
+ private static final String ACTION = "android.provider.Telephony.SMS_RECEIVED";
+ private final String url;
+
+ private MessageListener messageListener;
+ private short port;
+ private final Object receiveLock;
+ private final ArrayList<Message> receivedMessages;
+ private boolean isListeningForMessages;
+
+ public MessageConnectionImpl(String url) {
+ url = url.substring("sms://".length());
+ this.url = url;
+
+ this.receiveLock = new Object();
+ this.receivedMessages = new ArrayList<Message>();
+ int colonIndex = url.indexOf(':');
+ if (colonIndex != -1 && colonIndex < url.length() - 1) {
+ String portStr = url.substring(colonIndex + 1);
+ for (int i = 0; i < portStr.length(); i++) {
+ if (!Character.isDigit(portStr.charAt(i))) {
+ portStr = portStr.substring(0, i);
+ break;
+ }
+ }
+ this.port = (short) Integer.parseInt(portStr);
+ }
+ }
+
+ public Message newMessage(String type) {
+ return newMessage(type, this.url);
+ }
+
+ public Message newMessage(String type, String address) {
+ if (MessageConnection.TEXT_MESSAGE.equals(type)) {
+ return new TextMessageImpl(address);
+ }
+
+ if (MessageConnection.BINARY_MESSAGE.equals(type)) {
+ return new BinaryMessageImpl(address);
+ }
+
+ throw new IllegalArgumentException();
+ }
+
+ public int numberOfSegments(Message msg) {
+ // maximum length is 140 byts or 160 characters (with 7bit characters):
+ if (msg instanceof TextMessage) {
+
+ String text = ((TextMessage) msg).getPayloadText();
+ ArrayList<String> segments = SmsManager.getDefault().divideMessage(text);
+ return segments.size();
+ }
+
+ if (msg instanceof BinaryMessage) {
+ byte[] data = ((BinaryMessage) msg).getPayloadData();
+ return (data == null) ? 1 : (data.length / 140) + 1;
+ }
+
+ return 0;
+ }
+
+ public Message receive() throws IOException, InterruptedIOException {
+ if (!this.isListeningForMessages) {
+ setupMessageReceiver();
+ }
+ synchronized (this.receiveLock) {
+ if (this.receivedMessages.size() > 0) {
+ Message msg = this.receivedMessages.remove(0);
+ return msg;
+ }
+ try {
+ this.receiveLock.wait();
+ } catch (InterruptedException e) {
+ // ignore
+ }
+ }
+ if (this.receivedMessages.size() > 0) {
+ Message msg = this.receivedMessages.remove(0);
+ return msg;
+ } else {
+ throw new InterruptedIOException();
+ }
+ }
+
+ private void setupMessageReceiver() {
+ this.isListeningForMessages = true;
+ IntentFilter filter = new IntentFilter(ACTION);
+ AndroidMeMIDlet.DEFAULT_ACTIVITY.registerReceiver(this, filter);
+ }
+
+ public void send(Message msg) throws IOException, InterruptedIOException {
+ String address = msg.getAddress();
+ if (msg instanceof TextMessage) {
+ // TODO when a port is specified use data message?
+ String text = ((TextMessage) msg).getPayloadText();
+ SmsManager.getDefault().sendTextMessage(address, null, text, null, null);
+ } else if (msg instanceof BinaryMessage) {
+ byte[] data = ((BinaryMessage) msg).getPayloadData();
+ SmsManager.getDefault().sendDataMessage(address, null, this.port, data, null, null);
+ } else {
+ throw new IOException("invalid type: " + msg);
+ }
+ }
+
+ public void setMessageListener(MessageListener l) throws IOException {
+ if (!this.isListeningForMessages) {
+ setupMessageReceiver();
+ }
+ this.messageListener = l;
+ }
+
+ public void close() throws IOException {
+ // TODO check if SmsManager needs to be released
+ synchronized (this.receiveLock) {
+ this.receiveLock.notify();
+ }
+ if (this.isListeningForMessages) {
+ AndroidMeMIDlet.DEFAULT_ACTIVITY.unregisterReceiver(this);
+ this.isListeningForMessages = false;
+ }
+ }
+
+ @Override
+ public void onReceive(Context ctx, Intent intent) {
+ // #debug
+ System.out.println("SMS:onReceive.");
+ Bundle bundle = intent.getExtras();
+ Object messages[] = (Object[]) bundle.get("pdus");
+ for (int n = 0; n < messages.length; n++) {
+ SmsMessage msg = SmsMessage.createFromPdu((byte[]) messages[n]);
+ // TODO: how to create binary messages?
+ TextMessage textMsg = new TextMessageImpl(msg.getOriginatingAddress(), new Date(msg.getTimestampMillis()));
+ this.receivedMessages.add(textMsg);
+ synchronized (this.receiveLock) {
+ this.receiveLock.notify();
+ }
+ if (this.messageListener != null) {
+ this.messageListener.notifyIncomingMessage(this);
+ }
+ }
+ }
+}
Added: AndroidME/src_Android/net/yura/android/messaging/MessageImpl.java
===================================================================
--- AndroidME/src_Android/net/yura/android/messaging/MessageImpl.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/messaging/MessageImpl.java 2010-04-28 15:27:05 UTC (rev 855)
@@ -0,0 +1,36 @@
+package net.yura.android.messaging;
+
+import java.util.Date;
+
+import javax.wireless.messaging.Message;
+
+/**
+ * Provides basic Message implementation.
+ */
+public class MessageImpl implements Message {
+
+ protected String address;
+ protected Date timestamp;
+
+ public MessageImpl(String address, Date timestamp) {
+ this.timestamp = timestamp;
+ if (address != null) {
+ setAddress(address);
+ }
+ }
+
+ public Date getTimestamp() {
+ return this.timestamp;
+ }
+
+ public String getAddress() {
+ return this.address;
+ }
+
+ public void setAddress(String addr) {
+ if (addr.startsWith("sms://")) {
+ addr = addr.substring(6);
+ }
+ this.address = addr;
+ }
+}
Added: AndroidME/src_Android/net/yura/android/messaging/TextMessageImpl.java
===================================================================
--- AndroidME/src_Android/net/yura/android/messaging/TextMessageImpl.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/messaging/TextMessageImpl.java 2010-04-28 15:27:05 UTC (rev 855)
@@ -0,0 +1,29 @@
+package net.yura.android.messaging;
+
+import java.util.Date;
+
+import javax.wireless.messaging.TextMessage;
+
+/**
+ * Provides TextMessage functionalities.
+ */
+public class TextMessageImpl extends MessageImpl implements TextMessage {
+
+ private String payloadText;
+
+ public TextMessageImpl(String address) {
+ this(address, null);
+ }
+
+ public TextMessageImpl(String address, Date timestamp) {
+ super(address, timestamp);
+ }
+
+ public String getPayloadText() {
+ return this.payloadText;
+ }
+
+ public void setPayloadText(String payloadText) {
+ this.payloadText = payloadText;
+ }
+}
Modified: AndroidME/src_MIDP/javax/microedition/io/Connector.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/io/Connector.java 2010-04-28 14:21:22 UTC (rev 854)
+++ AndroidME/src_MIDP/javax/microedition/io/Connector.java 2010-04-28 15:27:05 UTC (rev 855)
@@ -11,66 +11,71 @@
import net.yura.android.io.file.AndroidFileConnection;
import net.yura.android.io.socket.ServerSocketConnection;
import net.yura.android.io.socket.SocketConnection;
+import net.yura.android.messaging.MessageConnectionImpl;
public class Connector {
- public static final int READ = 0x01;
- public static final int WRITE = 0x02;
- public static final int READ_WRITE = READ | WRITE;
+ public static final int READ = 0x01;
+ public static final int WRITE = 0x02;
+ public static final int READ_WRITE = READ | WRITE;
- private static final String PROTOCOL_FILE = "file:";
- private static final String PROTOCOL_SOCKET = "socket:";
- private static final String PROTOCOL_HTTP = "http:";
+ private static final String PROTOCOL_FILE = "file:";
+ private static final String PROTOCOL_SOCKET = "socket:";
+ private static final String PROTOCOL_HTTP = "http:";
+ private static final String PROTOCOL_SMS = "sms:";
- public static final Connection open(String name) throws IOException {
- return open(name, READ_WRITE);
- }
+ public static final Connection open(String name) throws IOException {
+ return open(name, READ_WRITE);
+ }
- public static final Connection open(String name, int mode)
- throws IOException {
- Connection connection;
- if (name.startsWith(PROTOCOL_FILE)) {
- connection = new AndroidFileConnection(name);
- // TODO : http should have a separate connection type
- } else if (name.startsWith(PROTOCOL_SOCKET)) {
- connection = getSocketConnection(name);
- } else {
- connection = new AndroidURLConnection(name);
- }
- return connection;
- }
+ public static final Connection open(String name, int mode)
+ throws IOException {
+ Connection connection;
+ if (name.startsWith(PROTOCOL_FILE)) {
+ connection = new AndroidFileConnection(name);
+ // TODO : http should have a separate connection type
+ } else if (name.startsWith(PROTOCOL_SOCKET)) {
+ connection = getSocketConnection(name);
+ }
+ else if (name.startsWith(PROTOCOL_SMS)) {
+ connection = new MessageConnectionImpl(name);
+ } else {
+ connection = new AndroidURLConnection(name);
+ }
+ return connection;
+ }
- public static final DataInputStream openDataInputStream(String name)
- throws IOException {
- return new DataInputStream(openInputStream(name));
- }
+ public static final DataInputStream openDataInputStream(String name)
+ throws IOException {
+ return new DataInputStream(openInputStream(name));
+ }
- public static final DataOutputStream openDataOutputStream(String name)
- throws IOException {
- return new DataOutputStream(openOutputStream(name));
- }
+ public static final DataOutputStream openDataOutputStream(String name)
+ throws IOException {
+ return new DataOutputStream(openOutputStream(name));
+ }
- public static final InputStream openInputStream(String name)
- throws IOException {
- Connection connection = open(name, READ);
- return ((InputConnection) connection).openInputStream();
- }
+ public static final InputStream openInputStream(String name)
+ throws IOException {
+ Connection connection = open(name, READ);
+ return ((InputConnection) connection).openInputStream();
+ }
- public static final OutputStream openOutputStream(String name)
- throws IOException {
- Connection connection = open(name, WRITE);
- return ((OutputConnection) connection).openOutputStream();
- }
+ public static final OutputStream openOutputStream(String name)
+ throws IOException {
+ Connection connection = open(name, WRITE);
+ return ((OutputConnection) connection).openOutputStream();
+ }
- private static Connection getSocketConnection(String name) throws IOException {
- int portSepIndex = name.lastIndexOf(':');
- int port = Integer.parseInt(name.substring(portSepIndex + 1));
- String host = name.substring("socket://".length(), portSepIndex);
+ private static Connection getSocketConnection(String name) throws IOException {
+ int portSepIndex = name.lastIndexOf(':');
+ int port = Integer.parseInt(name.substring(portSepIndex + 1));
+ String host = name.substring("socket://".length(), portSepIndex);
- if (host.length() > 0) {
- return new SocketConnection(host, port);
- } else {
- return new ServerSocketConnection(port);
- }
- }
+ if (host.length() > 0) {
+ return new SocketConnection(host, port);
+ } else {
+ return new ServerSocketConnection(port);
+ }
+ }
}
Modified: AndroidME/src_Test/net/yura/android/MainTest.java
===================================================================
--- AndroidME/src_Test/net/yura/android/MainTest.java 2010-04-28 14:21:22 UTC (rev 854)
+++ AndroidME/src_Test/net/yura/android/MainTest.java 2010-04-28 15:27:05 UTC (rev 855)
@@ -1,12 +1,29 @@
package net.yura.android;
+
+
+import javax.microedition.io.Connector;
+import javax.microedition.lcdui.Graphics;
+import javax.wireless.messaging.MessageConnection;
+import javax.wireless.messaging.TextMessage;
+
import net.yura.mobile.gui.Midlet;
+import net.yura.mobile.gui.components.Button;
import net.yura.mobile.gui.components.Label;
+import net.yura.mobile.gui.components.Panel;
+import net.yura.mobile.gui.components.TextField;
+import net.yura.mobile.logging.Logger;
+import net.yura.mobile.gui.layout.BorderLayout;
+import net.yura.mobile.gui.layout.BoxLayout;
+import net.yura.mobile.gui.layout.FlowLayout;
import net.yura.mobile.test.MainPane;
import net.yura.mobile.test.MainPane.Section;
public class MainTest extends Section {
+ private TextField smsTextField;
+ private TextField smsNumberField;
+
public MainTest(MainPane mainPane) {
super(mainPane);
}
@@ -17,6 +34,7 @@
addSection("PIM", new PimTest());
addSection("Multimedia", new MultimediaTest());
+ addTest("Send SMS", "sms");
}
// @Override
@@ -27,8 +45,54 @@
else if ("exit".equals(actionCommand)) {
Midlet.exit();
}
- else if ("pim".equals(actionCommand)) {
- //TODO:
+ else if ("sms".equals(actionCommand)) {
+
+
+ smsTextField = new TextField();
+ smsNumberField = new TextField(TextField.PHONENUMBER);
+
+ Button smsSendBtn = new Button("Send SMS");
+ smsSendBtn.setActionCommand("sendSms");
+ smsSendBtn.addActionListener(this);
+
+ Panel left = new Panel(new FlowLayout(Graphics.VCENTER, 0));
+ left.add(new Label("Text:"));
+ left.add(new Label("Phone:"));
+
+ Panel right = new Panel(new BoxLayout(Graphics.VCENTER));
+ right.add(smsTextField);
+ right.add(smsNumberField);
+
+ Panel smsPanel = new Panel(new BorderLayout());
+ smsPanel.add(left, Graphics.LEFT);
+ smsPanel.add(right);
+ smsPanel.add(smsSendBtn, Graphics.BOTTOM);
+
+ addToScrollPane(smsPanel, null);
}
}
+
+ public void actionPerformed(String actionCommand) {
+ if ("sendSms".equals(actionCommand)) {
+ System.out.println(">>>>> sendSms");
+
+ String phoneNumber = smsNumberField.getText();
+ String message = smsTextField.getText();
+
+ try {
+ MessageConnection conn = (MessageConnection) Connector.open("sms://" + phoneNumber);
+ TextMessage msg = (TextMessage) conn.newMessage(MessageConnection.TEXT_MESSAGE);
+ msg.setPayloadText(message);
+ //#debug
+ Logger.debug("Sending SMS message with body " + message + " to phone number " + phoneNumber);
+ conn.send(msg);
+ }
+ catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+ else {
+ super.actionPerformed(actionCommand);
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-05-04 13:38:44
|
Revision: 870
http://swingme.svn.sourceforge.net/swingme/?rev=870&view=rev
Author: janeroski
Date: 2010-05-04 13:38:37 +0000 (Tue, 04 May 2010)
Log Message:
-----------
Canvas: change ky codes for menu and back
- SwingMe now understand Menu and Back as "Soft-keys"
Modified Paths:
--------------
AndroidME/AndroidTODO.txt
AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
Modified: AndroidME/AndroidTODO.txt
===================================================================
--- AndroidME/AndroidTODO.txt 2010-05-04 11:28:18 UTC (rev 869)
+++ AndroidME/AndroidTODO.txt 2010-05-04 13:38:37 UTC (rev 870)
@@ -1,7 +1,8 @@
-- SMS
- Photo browser being able to go to next and previous image
+- Image scalling using 3D API
--- DONE ---
+- SMS
- setCurrentDisplay to null, should set app to background
- Blue tooth
- Camera
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-05-04 11:28:18 UTC (rev 869)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Canvas.java 2010-05-04 13:38:37 UTC (rev 870)
@@ -384,10 +384,10 @@
resultKeyCode = -5;
break;
case KeyEvent.KEYCODE_MENU :
- resultKeyCode = -6; // Left Soft-Key
+ resultKeyCode = -12;
break;
case KeyEvent.KEYCODE_BACK :
- resultKeyCode = -7; // Right Soft-Key
+ resultKeyCode = -11;
break;
case KeyEvent.KEYCODE_DEL :
resultKeyCode = -8; // Backspace ascii
@@ -396,7 +396,7 @@
resultKeyCode = -10;
break;
case KeyEvent.KEYCODE_ENDCALL :
- resultKeyCode = -11;
+ resultKeyCode = -11; // Never called on Android...
break;
case KeyEvent.KEYCODE_VOLUME_UP :
resultKeyCode = -36;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-05-04 15:45:28
|
Revision: 871
http://swingme.svn.sourceforge.net/swingme/?rev=871&view=rev
Author: janeroski
Date: 2010-05-04 15:45:21 +0000 (Tue, 04 May 2010)
Log Message:
-----------
RMS: Use SQLlite instead of File System (v0.1)
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/rms/RecordStore.java
Added Paths:
-----------
AndroidME/src_Android/net/yura/android/rms/SqlDao.java
AndroidME/src_Android/net/yura/android/rms/SqlRecordEnumeration.java
Removed Paths:
-------------
AndroidME/src_Android/net/yura/android/rms/RecordEnumerationImpl.java
Deleted: AndroidME/src_Android/net/yura/android/rms/RecordEnumerationImpl.java
===================================================================
--- AndroidME/src_Android/net/yura/android/rms/RecordEnumerationImpl.java 2010-05-04 13:38:37 UTC (rev 870)
+++ AndroidME/src_Android/net/yura/android/rms/RecordEnumerationImpl.java 2010-05-04 15:45:21 UTC (rev 871)
@@ -1,265 +0,0 @@
-/*
- * MicroEmulator
- * Copyright (C) 2001-2005 Bartek Teodorczyk <ba...@ba...>
- *
- * It is licensed under the following two licenses as alternatives:
- * 1. GNU Lesser General Public License (the "LGPL") version 2.1 or any newer version
- * 2. Apache License (the "AL") Version 2.0
- *
- * You may not use this file except in compliance with at least one of
- * the above two licenses.
- *
- * You may obtain a copy of the LGPL at
- * http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
- *
- * You may obtain a copy of the AL at
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the LGPL or the AL for the specific language governing permissions and
- * limitations.
- */
-
-package net.yura.android.rms;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import javax.microedition.rms.InvalidRecordIDException;
-import javax.microedition.rms.RecordComparator;
-import javax.microedition.rms.RecordEnumeration;
-import javax.microedition.rms.RecordFilter;
-import javax.microedition.rms.RecordListener;
-import javax.microedition.rms.RecordStore;
-import javax.microedition.rms.RecordStoreException;
-import javax.microedition.rms.RecordStoreNotOpenException;
-
-
-public class RecordEnumerationImpl implements RecordEnumeration
-{
- private RecordStore recordStore;
- private RecordFilter filter;
- private RecordComparator comparator;
- private boolean keepUpdated;
-
- private Vector enumerationRecords = new Vector();
- private int currentRecord;
-
- private RecordListener recordListener = new RecordListener()
- {
-
- public void recordAdded(RecordStore recordStore, int recordId) {
- rebuild();
- }
-
- public void recordChanged(RecordStore recordStore, int recordId) {
- rebuild();
- }
-
- public void recordDeleted(RecordStore recordStore, int recordId) {
- rebuild();
- }
-
- };
-
-
- public RecordEnumerationImpl(RecordStore recordStore, RecordFilter filter, RecordComparator comparator, boolean keepUpdated)
- {
- this.recordStore = recordStore;
- this.filter = filter;
- this.comparator = comparator;
- this.keepUpdated = keepUpdated;
-
- rebuild();
-
- if (keepUpdated) {
- recordStore.addRecordListener(recordListener);
- }
- }
-
-
- public int numRecords()
- {
- return enumerationRecords.size();
- }
-
-
- public byte[] nextRecord()
- throws InvalidRecordIDException, RecordStoreNotOpenException, RecordStoreException
- {
- if (!recordStore.isOpen()) {
- throw new RecordStoreNotOpenException();
- }
-
- if (currentRecord >= numRecords()) {
- throw new InvalidRecordIDException();
- }
-
- byte[] result = ((EnumerationRecord) enumerationRecords
- .elementAt(currentRecord)).value;
- currentRecord++;
-
- return result;
- }
-
-
- public int nextRecordId()
- throws InvalidRecordIDException
- {
- if (currentRecord >= numRecords()) {
- throw new InvalidRecordIDException();
- }
-
- int result = ((EnumerationRecord) enumerationRecords
- .elementAt(currentRecord)).recordId;
- currentRecord++;
-
- return result;
- }
-
-
- public byte[] previousRecord()
- throws InvalidRecordIDException, RecordStoreNotOpenException, RecordStoreException
- {
- if (!recordStore.isOpen()) {
- throw new RecordStoreNotOpenException();
- }
- if (currentRecord < 0) {
- throw new InvalidRecordIDException();
- }
-
- byte[] result = ((EnumerationRecord) enumerationRecords
- .elementAt(currentRecord)).value;
- currentRecord--;
-
- return result;
- }
-
-
- public int previousRecordId()
- throws InvalidRecordIDException
- {
- if (currentRecord < 0) {
- throw new InvalidRecordIDException();
- }
-
- int result = ((EnumerationRecord) enumerationRecords
- .elementAt(currentRecord)).recordId;
- currentRecord--;
-
- return result;
- }
-
-
- public boolean hasNextElement()
- {
- if (currentRecord == numRecords()) {
- return false;
- } else {
- return true;
- }
- }
-
-
- public boolean hasPreviousElement()
- {
- if (currentRecord == 0) {
- return false;
- } else {
- return true;
- }
- }
-
-
- public void reset()
- {
- currentRecord = 0;
- }
-
-
- public void rebuild()
- {
- enumerationRecords.removeAllElements();
-
- //
- // filter
- //
- for (Enumeration e = recordStore.records.keys(); e.hasMoreElements();) {
- Object key = e.nextElement();
- byte[] data = (byte[]) recordStore.records.get(key);
- if (filter != null && !filter.matches(data)) {
- continue;
- }
- enumerationRecords.add(new EnumerationRecord( ((Integer) key).intValue(),
- data));
- }
-
- //
- // sort
- //
- if (comparator != null) {
- Collections.sort(enumerationRecords, new Comparator() {
-
- public int compare(Object lhs, Object rhs) {
-
- int compare = comparator.compare(((EnumerationRecord) lhs).value,
- ((EnumerationRecord) rhs).value);
- if (compare == RecordComparator.EQUIVALENT)
- return 0;
- else if (compare == RecordComparator.FOLLOWS)
- return 1;
- else
- return -1;
-
- }
-
- });
- }
- }
-
-
- public void keepUpdated(boolean keepUpdated)
- {
- if (keepUpdated) {
- if (!this.keepUpdated) {
- rebuild();
- recordStore.addRecordListener(recordListener);
- }
- } else {
- recordStore.removeRecordListener(recordListener);
- }
-
- this.keepUpdated = keepUpdated;
- }
-
-
- public boolean isKeptUpdated()
- {
- return keepUpdated;
- }
-
-
- public void destroy()
- {
- }
-
-
- class EnumerationRecord
- {
- int recordId;
-
- byte[] value;
-
-
- EnumerationRecord(int recordId, byte[] value)
- {
- this.recordId = recordId;
- this.value = value;
- }
- }
-
-}
Added: AndroidME/src_Android/net/yura/android/rms/SqlDao.java
===================================================================
--- AndroidME/src_Android/net/yura/android/rms/SqlDao.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/rms/SqlDao.java 2010-05-04 15:45:21 UTC (rev 871)
@@ -0,0 +1,392 @@
+package net.yura.android.rms;
+
+import javax.microedition.rms.RecordStore;
+import javax.microedition.rms.RecordStoreException;
+import javax.microedition.rms.RecordStoreNotFoundException;
+
+import net.yura.android.AndroidMeMIDlet;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteDatabase.CursorFactory;
+
+/**
+ * This DAO manages one database. It is a singleton and is only valid for one application.
+ * TODO: How to close the database? Is there a close hook?
+ * @author rickyn
+ *
+ */
+public class SqlDao {
+
+ private final class RecordStoreSqliteOpenHelper extends SQLiteOpenHelper {
+
+ RecordStoreSqliteOpenHelper(Context context, String name,
+ CursorFactory factory, int version) {
+ super(context, name, factory, version);
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase database2) {
+ // Version 1.
+ // TODO: Add upgrade mechanism to add a size field in the Record table.
+ // TODO: Add an index to the tables. Check if it is needed for the PK.
+ String a = "CREATE TABLE "+TABLENAME_RECORDSTORE+" (" +
+ COLUMNNAME_RECORDSTORE_RECORDSTORE_PK + " INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT," +
+ COLUMNNAME_RECORDSTORE_NAME + " VARCHAR(30) NOT NULL," +
+ COLUMNNAME_RECORDSTORE_SIZE+" INT DEFAULT 0," +
+ COLUMNNAME_RECORDSTORE_NEXTID+" INT DEFAULT 1," +
+ "auth_mode INT DEFAULT 0," +
+ "writeable TINYINT(1) DEFAULT 0," +
+ COLUMNNAME_RECORDSTORE_VERSION + " INT DEFAULT 0," +
+ COLUMNNAME_RECORDSTORE_NUMBER_OF_RECORDS + " INT DEFAULT 0," +
+ "timestamp INT DEFAULT 0);";
+ String b = "CREATE TABLE " + TABLENAME_RECORD + " (" +
+ COLUMNNAME_RECORD_RECORD_PK + " INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT," +
+ COLUMNNAME_RECORD_RECORDSTORE_FK + " INT NOT NULL," +
+ COLUMNNAME_RECORD_DATA + " BLOB," +
+ COLUMNNAME_RECORD_RECORDNUMBER + " INT NOT NULL);";
+ database2.beginTransaction();
+ database2.execSQL(a);
+ database2.execSQL(b);
+ database2.setTransactionSuccessful();
+ database2.endTransaction();
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase arg0, int arg1, int arg2) {
+ //#debug
+ System.out.println("ERROR:Call to RecordStoreSqliteOpenHelper.onUpgrade not implemented. arg1:"+arg1+". arg2:"+arg2);
+ }
+ }
+
+ public static final String TABLENAME_RECORDSTORE = "recordstore";
+ public static final String COLUMNNAME_RECORDSTORE_RECORDSTORE_PK = "recordstore_pk";
+ public static final String COLUMNNAME_RECORDSTORE_NAME = "name";
+ public static final String COLUMNNAME_RECORDSTORE_VERSION = "version";
+ public static final String COLUMNNAME_RECORDSTORE_NEXTID = "nextId";
+ public static final String COLUMNNAME_RECORDSTORE_NUMBER_OF_RECORDS = "number_of_records";
+ public static final String COLUMNNAME_RECORDSTORE_SIZE = "current_size";
+
+ public static final String TABLENAME_RECORD = "record";
+ public static final String COLUMNNAME_RECORD_RECORD_PK = "record_pk";
+ public static final String COLUMNNAME_RECORD_RECORDSTORE_FK = "recordstore_fk";
+ // The number of the record. It is used by the API
+ public static final String COLUMNNAME_RECORD_RECORDNUMBER = "record_number";
+ public static final String COLUMNNAME_RECORD_DATA = "bytes";
+
+ private static SQLiteDatabase database;
+ private static SqlDao instance;
+
+ private SqlDao() {
+ init();
+ }
+
+ public static SqlDao getInstance() {
+ // Do not make a static initialization as we need a context. We have to test at which point in the startup process the context is available.
+ if(instance == null) {
+ instance = new SqlDao();
+ }
+ return instance;
+ }
+
+ /**
+ * Get the record store with the given name from the database.
+ * @param recordStoreName The name of the record store. Must not be null.
+ * @return An RecordStore object or null if the record store could not be found.
+ */
+ public synchronized RecordStore getRecordStore(String recordStoreName) {
+ if(recordStoreName == null) {
+ throw new IllegalArgumentException("The parameter 'recordStoreName' must not be null.");
+ }
+ Cursor resultCursor = database.query(SqlDao.TABLENAME_RECORDSTORE, null, "name = ?", new String[] {recordStoreName}, null, null, null);
+ RecordStore recordStore;
+ try {
+ if(resultCursor.getCount() == 0) {
+ return null;
+ }
+ recordStore = extractRecordStore(resultCursor);
+ } finally {
+ resultCursor.close();
+ }
+ return recordStore;
+ }
+
+ public synchronized RecordStore getRecordStore(long pk) {
+ if(pk < 0) {
+ throw new IllegalArgumentException("The parameter 'recordStoreName' must not have a negative value.");
+ }
+ Cursor result;
+ RecordStore recordStore;
+ result = database.query(SqlDao.TABLENAME_RECORDSTORE, null, COLUMNNAME_RECORDSTORE_RECORDSTORE_PK+" = ?", new String[] {pk+""}, null, null, null);
+ try {
+ if(result.getCount() == 0) {
+ return null;
+ }
+ recordStore = extractRecordStore(result);
+ } finally {
+ result.close();
+ }
+ return recordStore;
+ }
+
+ /**
+ * This methods extracts a RecordStore object from the database cursor. This method will not close this cursor, the caller is responsible for it.
+ * @param result A Cursor object which is not closed and will not be closed by this method.
+ * @return
+ */
+ private synchronized RecordStore extractRecordStore(Cursor result) {
+ result.moveToFirst();
+ int indexOfColumn;
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_RECORDSTORE_PK);
+ int id = result.getInt(indexOfColumn);
+
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_VERSION);
+ int version = result.getInt(indexOfColumn);
+
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_NEXTID);
+ int nextId = result.getInt(indexOfColumn);
+
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_NAME);
+ String recordStoreName = result.getString(indexOfColumn);
+
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_NUMBER_OF_RECORDS);
+ int numberOfRecords = result.getInt(indexOfColumn);
+
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_SIZE);
+ int size = result.getInt(indexOfColumn);
+
+ RecordStore recordStore = new RecordStore(recordStoreName,id);
+ recordStore.setVersion(version);
+ recordStore.setNextId(nextId);
+ recordStore.setNumberOfRecords(numberOfRecords);
+ recordStore.setSize(size);
+
+ return recordStore;
+ }
+
+ /**
+ * Creates a record store entry in the database.
+ * @param recordStoreName The name of the record store to be created. The name must be unique. The value must not be null.
+ * @return A RecordStore object.
+ * @throws RecordStoreException
+ * @throws DaoException In case anything goes wrong. This situation is fatal.
+ */
+ public synchronized RecordStore createRecordStore(String recordStoreName) throws RecordStoreException {
+ if(recordStoreName == null) {
+ throw new IllegalArgumentException("The parameter 'recordStoreName' must not be null.");
+ }
+ ContentValues values = new ContentValues();
+ values.put(COLUMNNAME_RECORDSTORE_NAME, recordStoreName);
+ long id;
+ try {
+ database.beginTransaction();
+ id = database.insertOrThrow(SqlDao.TABLENAME_RECORDSTORE, null, values);
+ database.setTransactionSuccessful();
+ database.endTransaction();
+ } catch (SQLException e) {
+ throw new RecordStoreException("Could not insert record store row with name '"+recordStoreName+"'. Reason: "+e);
+ }
+ if(id == -1) {
+ throw new RecordStoreException("Could not insert record store row with name '"+recordStoreName+"'. Reason: The method 'SQLiteDatabase.insertOrThrow' returned '-1' instead of throwing an exception.");
+ }
+ RecordStore recordStore = new RecordStore(recordStoreName,id);
+ return recordStore;
+ }
+
+ private void init() {
+ Context context = AndroidMeMIDlet.DEFAULT_ACTIVITY;
+ SQLiteOpenHelper recordStoreSqliteOpenHelper = new RecordStoreSqliteOpenHelper(context, "recordstoredb", null, 3);
+ database = recordStoreSqliteOpenHelper.getWritableDatabase();
+ }
+
+ public synchronized void destroy() {
+ database.close();
+ }
+
+ public synchronized String[] listRecordStores() {
+ Cursor resultCursor = database.query(TABLENAME_RECORDSTORE, new String[] {COLUMNNAME_RECORDSTORE_NAME}, null, null, null, null,null);
+ String[] recordStores;
+ try {
+ int numberOfRecordStores = resultCursor.getCount();
+ recordStores = new String[numberOfRecordStores];
+ for (int i = 0; i < numberOfRecordStores; i++) {
+ resultCursor.move(1);
+ recordStores[i] = resultCursor.getString(0);
+ }
+ } finally {
+ resultCursor.close();
+ }
+ return recordStores;
+ }
+
+ public synchronized void deleteRecordStore(String recordStoreName) throws RecordStoreNotFoundException {
+ RecordStore recordStore = getRecordStore(recordStoreName);
+ if(recordStore == null) {
+ throw new RecordStoreNotFoundException("Could not delete row in table '"+TABLENAME_RECORDSTORE+"' with value '"+recordStoreName+"'");
+ }
+ database.beginTransaction();
+ database.delete(TABLENAME_RECORDSTORE, "name = ?", new String[]{recordStoreName});
+ database.delete(TABLENAME_RECORD, COLUMNNAME_RECORD_RECORDSTORE_FK+" = ?", new String[]{Long.toString(recordStore.getPk())});
+ database.setTransactionSuccessful();
+ database.endTransaction();
+ }
+
+ /**
+ *
+ * @param recordStoreFk the primary key of the recordstore this record is created in. This value must be valid as it is not cheched.
+ * @param data Must not be null.
+ * @return the id of the added record
+ * @throws RecordStoreException
+ */
+ public synchronized int addRecord(long recordStoreFk, byte[] data) throws RecordStoreException {
+ Cursor result = database.query(SqlDao.TABLENAME_RECORDSTORE, null, COLUMNNAME_RECORDSTORE_RECORDSTORE_PK+" = ?", new String[] {recordStoreFk+""}, null, null, null);
+ int version;
+ int nextRecordId;
+ int numberOfRecords;
+ int size;
+ try {
+ result.moveToFirst();
+ int indexOfColumn;
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_VERSION);
+ version = result.getInt(indexOfColumn);
+
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_NEXTID);
+ nextRecordId = result.getInt(indexOfColumn);
+
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_NUMBER_OF_RECORDS);
+ numberOfRecords = result.getInt(indexOfColumn);
+
+ indexOfColumn = result.getColumnIndex(SqlDao.COLUMNNAME_RECORDSTORE_SIZE);
+ size = result.getInt(indexOfColumn);
+ } finally {
+ result.close();
+ }
+
+ // Insert record.
+ ContentValues values;
+ values = new ContentValues();
+ values.put(COLUMNNAME_RECORD_DATA, data);
+ values.put(COLUMNNAME_RECORD_RECORDNUMBER, new Integer(nextRecordId));
+ values.put(COLUMNNAME_RECORD_RECORDSTORE_FK, new Long(recordStoreFk));
+ try {
+ database.beginTransaction();
+ database.insertOrThrow(TABLENAME_RECORD, null, values);
+ database.setTransactionSuccessful();
+ database.endTransaction();
+ } catch (SQLException e) {
+ throw new RecordStoreException(e.toString());
+ }
+
+ // Update record store stats.
+ values.clear();
+ int newVersion = version + 1;
+ int newNextId = nextRecordId + 1;
+ int newNumberOfRecords = numberOfRecords + 1;
+ int recordStoreSize = size + data.length;
+ values.put(COLUMNNAME_RECORDSTORE_VERSION, new Integer(newVersion));
+ values.put(COLUMNNAME_RECORDSTORE_NEXTID, new Integer(newNextId));
+ values.put(COLUMNNAME_RECORDSTORE_NUMBER_OF_RECORDS, new Integer(newNumberOfRecords));
+ values.put(COLUMNNAME_RECORDSTORE_SIZE, new Integer(recordStoreSize));
+ try {
+ database.beginTransaction();
+ database.update(TABLENAME_RECORDSTORE, values, COLUMNNAME_RECORDSTORE_RECORDSTORE_PK + "= ?" , new String[] {Long.toString(recordStoreFk)});
+ database.setTransactionSuccessful();
+ database.endTransaction();
+ } catch (Exception e) {
+ throw new RecordStoreException(e.toString());
+ }
+ return nextRecordId;
+
+ }
+
+ /**
+ * @param recordStorePk
+ * @param recordId
+ * @return the data, or null
+ */
+ public synchronized byte[] getRecord(long recordStorePk, int recordId) {
+ Cursor resultCursor = database.query(TABLENAME_RECORD,new String[] {COLUMNNAME_RECORD_DATA},COLUMNNAME_RECORD_RECORDNUMBER+"=? AND "+COLUMNNAME_RECORD_RECORDSTORE_FK+"=?",new String[] {Long.toString(recordId),Long.toString(recordStorePk)},null,null,null);
+ byte[] data;
+ try {
+ if(resultCursor.getCount() == 0) {
+ return null;
+ }
+ resultCursor.moveToFirst();
+ data = resultCursor.getBlob(0);
+ } finally {
+ resultCursor.close();
+ }
+ return data;
+ }
+
+ /**
+ *
+ * @param recordStorePk
+ * @param recordId
+ * @param data Must not be null.
+ * @throws RecordStoreException
+ */
+ public synchronized void setRecord(long recordStorePk, int recordId, byte[] data) throws RecordStoreException {
+ ContentValues values = new ContentValues();
+ values.put(COLUMNNAME_RECORD_DATA, data);
+ try {
+ database.beginTransaction();
+ database.update(TABLENAME_RECORD, values, COLUMNNAME_RECORD_RECORDSTORE_FK + "= ? AND "+COLUMNNAME_RECORD_RECORDNUMBER+"=?" , new String[] {Long.toString(recordStorePk),Integer.toString(recordId)});
+ database.setTransactionSuccessful();
+ database.endTransaction();
+ } catch (Exception e) {
+ throw new RecordStoreException(e.toString());
+ }
+ RecordStore recordStore = getRecordStore(recordStorePk);
+ byte[] oldData = getRecord(recordStorePk,recordId);
+ values.clear();
+ int size = recordStore.getSize() + - oldData.length + data.length;
+ int version = recordStore.getVersion() + 1;
+ values.put(COLUMNNAME_RECORDSTORE_SIZE, new Integer(size));
+ values.put(COLUMNNAME_RECORDSTORE_VERSION, new Integer(version));
+ database.update(TABLENAME_RECORDSTORE, values, COLUMNNAME_RECORDSTORE_RECORDSTORE_PK + "= ?" , new String[] {Long.toString(recordStorePk)});
+ }
+
+ public synchronized void removeRecord(long recordStorePk, int recordId) throws RecordStoreException {
+ //TODO: Update the size in the recordstore table.
+ //TODO: Cache the size in the record table.
+ RecordStore recordStore = getRecordStore(recordStorePk);
+ byte[] oldData = getRecord(recordStorePk,recordId);
+ ContentValues values = new ContentValues();
+ int size = recordStore.getSize() - oldData.length;
+ int version = recordStore.getVersion() + 1;
+ values.put(COLUMNNAME_RECORDSTORE_SIZE, new Integer(size));
+ values.put(COLUMNNAME_RECORDSTORE_VERSION, new Integer(version));
+ database.update(TABLENAME_RECORDSTORE, values, COLUMNNAME_RECORDSTORE_RECORDSTORE_PK + "= ?" , new String[] {Long.toString(recordStorePk)});
+ database.delete(TABLENAME_RECORD,COLUMNNAME_RECORD_RECORDNUMBER+"=? AND "+COLUMNNAME_RECORD_RECORDSTORE_FK+"=?",new String[] {Integer.toString(recordId),Long.toString(recordStorePk)});
+ }
+
+ public synchronized int[] getRecordIdsForRecordStore(long recordStorePk) {
+ Cursor resultCursor = database.query(TABLENAME_RECORD,new String[] {COLUMNNAME_RECORD_RECORDNUMBER},COLUMNNAME_RECORD_RECORDSTORE_FK+"=?",new String[] {Long.toString(recordStorePk)},null,null,COLUMNNAME_RECORD_RECORDNUMBER+" ASC");
+ int[] result;
+ try {
+ int numberOfRecords = resultCursor.getCount();
+ if(numberOfRecords == 0) {
+ return new int[0];
+ }
+ resultCursor.moveToFirst();
+ result = new int[numberOfRecords];
+ for (int i = 0; i < numberOfRecords; i++) {
+ result[i] = resultCursor.getInt(0);
+ resultCursor.moveToNext();
+ }
+ } finally {
+ resultCursor.close();
+ }
+ return result;
+ }
+
+ // TODO: Implement this methods so we save expensive getRecord calls when updating the size in the methods setRecord and removeRecord.
+ public synchronized int getRecordSize() {
+ return 0;
+ }
+}
Added: AndroidME/src_Android/net/yura/android/rms/SqlRecordEnumeration.java
===================================================================
--- AndroidME/src_Android/net/yura/android/rms/SqlRecordEnumeration.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/rms/SqlRecordEnumeration.java 2010-05-04 15:45:21 UTC (rev 871)
@@ -0,0 +1,193 @@
+//#condition polish.android
+package net.yura.android.rms;
+
+import javax.microedition.rms.InvalidRecordIDException;
+import javax.microedition.rms.RecordComparator;
+import javax.microedition.rms.RecordEnumeration;
+import javax.microedition.rms.RecordFilter;
+import javax.microedition.rms.RecordStore;
+import javax.microedition.rms.RecordStoreException;
+import javax.microedition.rms.RecordStoreNotOpenException;
+
+public class SqlRecordEnumeration implements RecordEnumeration{
+
+ private final RecordStore recordStore;
+ private final RecordFilter filter;
+ private final RecordComparator comparator;
+ private boolean keepUpdated;
+ private int lastRecordIndex;
+ private boolean destroyed = false;
+ private SqlDao sqlDao;
+ private int[] recordIds;
+
+ public SqlRecordEnumeration(RecordStore recordStore, RecordFilter filter, RecordComparator comparator, boolean keepUpdated) {
+ this.recordStore = recordStore;
+ this.filter = filter;
+ this.comparator = comparator;
+ this.keepUpdated = keepUpdated;
+ this.sqlDao = SqlDao.getInstance();
+ rebuild();
+ }
+
+ public void destroy() {
+ this.destroyed = true;
+ }
+
+ public boolean hasNextElement() {
+ if(isDestroyed()) {
+ throw new IllegalStateException("This RecordEnumeration instance is destroyed.");
+ }
+ boolean hasNext = this.lastRecordIndex < this.recordIds.length-1;
+ return hasNext;
+ }
+
+ public boolean hasPreviousElement() {
+ if(isDestroyed()) {
+ throw new IllegalStateException("This RecordEnumeration instance is destroyed.");
+ }
+ boolean hasPrevious = this.lastRecordIndex > 0;
+ return hasPrevious;
+ }
+
+ public boolean isKeptUpdated() {
+ if(isDestroyed()) {
+ throw new IllegalStateException("This RecordEnumeration instance is destroyed.");
+ }
+ return this.keepUpdated;
+ }
+
+ public void keepUpdated(boolean keepUpdated2) {
+ if(isDestroyed()) {
+ throw new IllegalStateException("This RecordEnumeration instance is destroyed.");
+ }
+ this.keepUpdated = keepUpdated2;
+ }
+
+ public byte[] nextRecord() throws InvalidRecordIDException,RecordStoreNotOpenException, RecordStoreException {
+ if(isDestroyed()) {
+ throw new IllegalStateException("This RecordEnumeration instance is destroyed.");
+ }
+ if(this.recordStore.isClosed()) {
+ throw new RecordStoreNotOpenException("The record store which is enumerated is closed.");
+ }
+ int nextRecordIndex = this.lastRecordIndex + 1;
+ if(nextRecordIndex >= this.recordIds.length) {
+ throw new InvalidRecordIDException("The end of the enumeration is reached.");
+ }
+ this.lastRecordIndex = nextRecordIndex;
+ int recordId = this.recordIds[nextRecordIndex];
+ byte[] result = this.sqlDao.getRecord(this.recordStore.getPk(),recordId);
+ return result;
+ }
+
+ public int nextRecordId() throws InvalidRecordIDException {
+ if(isDestroyed()) {
+ throw new IllegalStateException("This RecordEnumeration instance is destroyed.");
+ }
+ int nextRecordIndex = this.lastRecordIndex + 1;
+ if(nextRecordIndex >= this.recordIds.length) {
+ throw new InvalidRecordIDException("No more records in this enumeration.");
+ }
+ this.lastRecordIndex = nextRecordIndex;
+ int nextRecordId = this.recordIds[nextRecordIndex];
+ return nextRecordId;
+ }
+
+ public int numRecords() {
+ if(isDestroyed()) {
+ throw new IllegalStateException("This RecordEnumeration instance is destroyed.");
+ }
+ return this.recordIds.length;
+ }
+
+ public byte[] previousRecord() throws InvalidRecordIDExcept...
[truncated message content] |
|
From: <jan...@us...> - 2010-05-05 16:00:49
|
Revision: 877
http://swingme.svn.sourceforge.net/swingme/?rev=877&view=rev
Author: janeroski
Date: 2010-05-05 16:00:43 +0000 (Wed, 05 May 2010)
Log Message:
-----------
Theme: Add a "non background" theme
- Speed up the drawing, since we should always be full screen, and have no transparent bits
Modified Paths:
--------------
AndroidME/AndroidManifest.xml
Added Paths:
-----------
AndroidME/res/
AndroidME/res/drawable-hdpi/
AndroidME/res/drawable-hdpi/icon.png
AndroidME/res/drawable-ldpi/
AndroidME/res/drawable-ldpi/icon.png
AndroidME/res/drawable-mdpi/
AndroidME/res/drawable-mdpi/icon.png
AndroidME/res/layout/
AndroidME/res/layout/main.xml
AndroidME/res/values/
AndroidME/res/values/strings.xml
AndroidME/res/values/theme.xml
Modified: AndroidME/AndroidManifest.xml
===================================================================
--- AndroidME/AndroidManifest.xml 2010-05-05 15:14:10 UTC (rev 876)
+++ AndroidME/AndroidManifest.xml 2010-05-05 16:00:43 UTC (rev 877)
@@ -3,7 +3,7 @@
package="net.yura.android"
android:versionCode="1"
android:versionName="1.0">
- <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@android:style/Theme.NoTitleBar">
+ <application android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@style/Theme.NoBackground">
<activity android:name=".AndroidMeMIDlet"
android:label="@string/app_name"
android:windowSoftInputMode="adjustResize"
Added: AndroidME/res/drawable-hdpi/icon.png
===================================================================
(Binary files differ)
Property changes on: AndroidME/res/drawable-hdpi/icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: AndroidME/res/drawable-ldpi/icon.png
===================================================================
(Binary files differ)
Property changes on: AndroidME/res/drawable-ldpi/icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: AndroidME/res/drawable-mdpi/icon.png
===================================================================
(Binary files differ)
Property changes on: AndroidME/res/drawable-mdpi/icon.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: AndroidME/res/layout/main.xml
===================================================================
--- AndroidME/res/layout/main.xml (rev 0)
+++ AndroidME/res/layout/main.xml 2010-05-05 16:00:43 UTC (rev 877)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="#000000"
+ android:cacheColorHint="#000000"
+ >
+ <TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/please_wait"
+ />
+</LinearLayout>
Added: AndroidME/res/values/strings.xml
===================================================================
--- AndroidME/res/values/strings.xml (rev 0)
+++ AndroidME/res/values/strings.xml 2010-05-05 16:00:43 UTC (rev 877)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="please_wait">Please Wait...</string>
+ <string name="app_name">Badoo</string>
+</resources>
Added: AndroidME/res/values/theme.xml
===================================================================
--- AndroidME/res/values/theme.xml (rev 0)
+++ AndroidME/res/values/theme.xml 2010-05-05 16:00:43 UTC (rev 877)
@@ -0,0 +1,6 @@
+<resources>
+ <style name="Theme.NoBackground" parent="android:Theme">
+ <item name="android:windowBackground">@null</item>
+ <item name="android:windowNoTitle">true</item>
+ </style>
+</resources>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jan...@us...> - 2010-05-07 10:18:44
|
Revision: 880
http://swingme.svn.sourceforge.net/swingme/?rev=880&view=rev
Author: janeroski
Date: 2010-05-07 10:18:38 +0000 (Fri, 07 May 2010)
Log Message:
-----------
Add experimental ANT build with Proguard support
Added Paths:
-----------
AndroidME/build.properties
AndroidME/build.xml
AndroidME/default.properties
AndroidME/local.properties
AndroidME/proguard.cfg
Added: AndroidME/build.properties
===================================================================
--- AndroidME/build.properties (rev 0)
+++ AndroidME/build.properties 2010-05-07 10:18:38 UTC (rev 880)
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+# 'source.dir' for the location of your java source folder and
+# 'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+# 'key.store' for the location of your keystore and
+# 'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
Added: AndroidME/build.xml
===================================================================
--- AndroidME/build.xml (rev 0)
+++ AndroidME/build.xml 2010-05-07 10:18:38 UTC (rev 880)
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="AndroidMe" default="help">
+
+ <copy file="../AndroidME/AndroidManifest.xml" todir="."/>
+
+ <path id="project.classpath">
+ <pathelement location="../AndroidME/src_Android"/>
+ <pathelement location="../AndroidME/src_JSR82_Bluetooth"/>
+ <pathelement location="../AndroidME/src_JSR120_SMS"/>
+ <pathelement location="../AndroidME/src_JSR135_Multimedia"/>
+ <pathelement location="../AndroidME/src_JSR179_Location"/>
+ <pathelement location="../AndroidME/src_JSR184_3D"/>
+ <pathelement location="../AndroidME/src_MIDP"/>
+ <pathelement location="../AndroidME/src_Test"/>
+
+ <pathelement location="../Abba/src"/>
+ <pathelement location="../BadooMobile/src"/>
+ <!--
+ <pathelement location="../LWUIT/trunk/MIDP/LWUIT/src"/>
+ <pathelement location="../LWUIT/trunk/MIDP/Applications/LWUITSpeed/src"/>
+ -->
+ <pathelement location="../SwingME/src"/>
+ <pathelement location="../SwingMETest/src"/>
+ <pathelement location="../UtilME/src"/>
+
+ </path>
+
+ <property name="source.dir" refid="project.classpath"/>
+ <property name="source.absolute.dir" refid="project.classpath" />
+ <property name="external.libs.dir" value="../UtilME/lib" />
+
+
+ <property name="resource.dir" value="../AndroidME/res" />
+ <property name="asset.dir" value="../workspace_Android/AndroidMe2/assets" />
+
+
+ <!-- The local.properties file is created and updated by the 'android' tool.
+ It contains the path to the SDK. It should *NOT* be checked in in Version
+ Control Systems. -->
+ <property file="local.properties" />
+
+ <!-- The build.properties file can be created by you and is never touched
+ by the 'android' tool. This is the place to change some of the default property values
+ used by the Ant rules.
+ Here are some properties you may want to change/update:
+
+ application.package
+ the name of your application package as defined in the manifest. Used by the
+ 'uninstall' rule.
+ source.dir
+ the name of the source directory. Default is 'src'.
+ out.dir
+ the name of the output directory. Default is 'bin'.
+
+ Properties related to the SDK location or the project target should be updated
+ using the 'android' tool with the 'update' action.
+
+ This file is an integral part of the build system for your application and
+ should be checked in in Version Control Systems.
+
+ -->
+ <property file="build.properties" />
+
+ <!-- The default.properties file is created and updated by the 'android' tool, as well
+ as ADT.
+ This file is an integral part of the build system for your application and
+ should be checked in in Version Control Systems. -->
+ <property file="default.properties" />
+
+ <!-- Custom Android task to deal with the project target, and import the proper rules.
+ This requires ant 1.6.0 or above. -->
+ <path id="android.antlibs">
+ <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
+ <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
+ </path>
+
+
+ <property name="verbose" value="false" />
+
+ <target name="-aidl" depends="-dirs">
+ <echo>Compiling aidl ignored...</echo>
+ </target>
+
+ <!-- Eclipse uses "bin" for its own output, so we do the same. -->
+ <property name="outdir" location="bin" />
+ <property name="AndroidFixResourceAsStream.jar" value="../AndroidME/lib/AndroidFixResourceAsStream.jar" />
+
+ <target name="fix-build">
+ <echo>Fixing build....</echo>
+ <echo message="ClassPath: ${AndroidFixResourceAsStream.jar}"/>
+
+ <java classname="net.yura.mobile.asm.AndroidFixer" classpath="${AndroidFixResourceAsStream.jar}">
+ <arg value="net.yura.android.AndroidMeMIDlet"/>
+ <arg value="${outdir}"/>
+ </java>
+
+ <move file="${outdir}" tofile="${outdir}.tmp"/>
+
+ <jar destfile="${outdir}.tmp/app.jar" basedir="${outdir}.tmp/classes/"/>
+
+ <property name="proguard.home" value="c:\Apps\proguard4.4\lib" />
+
+ <java fork="true" jar="${proguard.home}/proguard.jar">
+ <arg value="@proguard.cfg"/>
+ <arg value="-injars ${outdir}.tmp/app.jar"/>
+ <arg value="-outjars ${outdir}.tmp/app2.jar"/>
+ <arg value="-libraryjars ${android.jar};${external.libs.dir}"/>
+ </java>
+
+ <unzip src="${outdir}.tmp/app2.jar" dest="${outdir}/classes/"/>
+ </target>
+
+ <target name="-dex" depends="compile, fix-build ">
+ <dex-helper />
+ </target>
+
+
+
+ <taskdef name="setup"
+ classname="com.android.ant.SetupTask"
+ classpathref="android.antlibs" />
+
+ <!-- Execute the Android Setup task that will setup some properties specific to the target,
+ and import the build rules files.
+
+ The rules file is imported from
+ <SDK>/platforms/<target_platform>/templates/android_rules.xml
+
+ To customize some build steps for your project:
+ - copy the content of the main node <project> from android_rules.xml
+ - paste it in this build.xml below the <setup /> task.
+ - disable the import by changing the setup task below to <setup import="false" />
+
+ This will ensure that the properties are setup correctly but that your customized
+ build steps are used.
+ -->
+ <setup />
+
+ <property name="source.absolute.dir" refid="project.classpath" />
+
+ <macrodef name="package-helper">
+ <attribute name="sign.package" />
+ <element name="extra-jars" optional="yes" />
+ <sequential>
+ <apkbuilder
+ outfolder="${out.absolute.dir}"
+ basename="${ant.project.name}"
+ signed="@{sign.package}"
+ verbose="${verbose}">
+ <file path="${intermediate.dex.file}" />
+ <!--
+ <sourcefolder path="${source.absolute.dir}" />
+ <nativefolder path="${native.libs.absolute.dir}" />
+ <jarfolder path="${external.libs.absolute.dir}" />
+ -->
+ <extra-jars/>
+ </apkbuilder>
+ </sequential>
+ </macrodef>
+
+
+ <macrodef name="dex-helper">
+ <element name="external-libs" optional="yes" />
+ <element name="extra-parameters" optional="yes" />
+ <sequential>
+ <echo>-----Converting compiled files and external libraries into ${intermediate.dex.file}...
+ </echo>
+ <apply executable="${dx}" failonerror="true" parallel="true">
+ <arg value="--dex" />
+ <arg value="--no-strict" />
+ <arg value="--output=${intermediate.dex.file}" />
+ <extra-parameters />
+ <arg line="${verbose.option}" />
+ <arg path="${out.classes.absolute.dir}" />
+ <fileset dir="${external.libs.absolute.dir}" includes="*.jar" />
+ <external-libs />
+ </apply>
+ </sequential>
+ </macrodef>
+
+</project>
Added: AndroidME/default.properties
===================================================================
--- AndroidME/default.properties (rev 0)
+++ AndroidME/default.properties 2010-05-07 10:18:38 UTC (rev 880)
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-4
Added: AndroidME/local.properties
===================================================================
--- AndroidME/local.properties (rev 0)
+++ AndroidME/local.properties 2010-05-07 10:18:38 UTC (rev 880)
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must *NOT* be checked in Version Control Systems,
+# as it contains information specific to your local configuration.
+
+# location of the SDK. This is only used by Ant
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=C:\\Apps\\android-sdk_r04-windows
+
Added: AndroidME/proguard.cfg
===================================================================
--- AndroidME/proguard.cfg (rev 0)
+++ AndroidME/proguard.cfg 2010-05-07 10:18:38 UTC (rev 880)
@@ -0,0 +1,26 @@
+
+-dontpreverify
+-target 5
+-dontnote it.gerdavax.**
+-ignorewarnings
+
+
+-dontusemixedcaseclassnames
+-defaultpackage ''
+-repackageclasses ''
+-overloadaggressively
+
+-keep public class ** extends javax.microedition.midlet.MIDlet {
+ public *;
+}
+
+-keep public class ** extends android.** {
+ public *;
+}
+
+-keep class android.** {
+ public *;
+}
+
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
