Skip to content

Commit 5b0deee

Browse files
committed
IOIO: android integration
1 parent 7b2a32a commit 5b0deee

5 files changed

Lines changed: 145 additions & 84 deletions

File tree

ioio/ioio/src/main/java/ioio/lib/RuntimeUtil.java renamed to ioio/ioio/src/main/java/ioio/lib/AndroidUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package ioio.lib;
22

3-
public class RuntimeUtil {
3+
public class AndroidUtil {
44
private static final boolean isRunningOnAndroid;
55
static {
66
isRunningOnAndroid = getIsRunningOnAndroid();
77
}
88

9-
public static boolean isRunningOnAndroid() {
9+
public static boolean isAndroid() {
1010
return isRunningOnAndroid;
1111
}
1212

ioio/ioio/src/main/java/ioio/lib/spi/LogImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
*/
2929
package ioio.lib.spi;
3030

31-
import ioio.lib.RuntimeUtil;
31+
import ioio.lib.AndroidUtil;
3232
import ioio.lib.spi.Log.ILogger;
3333

3434
public class LogImpl implements ILogger {
3535
private static final char[] LEVELS = {'0', '1', 'V', 'D', 'I', 'W', 'E', 'F'};
36-
private static final ILogger logger = RuntimeUtil.isRunningOnAndroid() ? getAndroidLogger() : null;
36+
private static final ILogger logger = AndroidUtil.isAndroid() ? getAndroidLogger() : null;
3737

3838
@Override
3939
public void write(int level, String tag, String message) {

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/ConnectionController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.sourceforge.smallbasic.ioio;
22

3-
import ioio.lib.RuntimeUtil;
3+
import ioio.lib.AndroidUtil;
44
import ioio.lib.util.IOIOBaseApplicationHelper;
55
import ioio.lib.util.IOIOConnectionManager;
66
import ioio.lib.util.IOIOConnectionRegistry;
@@ -10,7 +10,7 @@ public class ConnectionController extends IOIOBaseApplicationHelper {
1010
private final IOIOConnectionManager manager = new IOIOConnectionManager(this);
1111

1212
static {
13-
if (RuntimeUtil.isRunningOnAndroid()) {
13+
if (AndroidUtil.isAndroid()) {
1414
IOIOConnectionRegistry.addBootstraps(new String[]{
1515
"ioio.lib.impl.SocketIOIOConnectionBootstrap",
1616
"ioio.lib.android.accessory.AccessoryConnectionBootstrap",

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/IOIOLoader.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,11 @@
44

55
public class IOIOLoader {
66
private static final String TAG = "IOIOLoader";
7-
public static native void init(Class<?> clazz);
7+
public static native void init(Long app);
88

9-
public IOIOLoader() {
9+
public IOIOLoader(Long activity) {
1010
super();
11-
init(getClass());
12-
}
13-
14-
public static Class<?> findClass(String className) {
15-
try {
16-
Log.i(TAG, "findClass " + className);
17-
return Class.forName("net.sourceforge.smallbasic.ioio." + className);
18-
}
19-
catch (ClassNotFoundException e) {
20-
throw new RuntimeException(e);
21-
}
11+
Log.d(TAG, "IOIOLoader: " + activity);
12+
init(activity);
2213
}
2314
}

0 commit comments

Comments
 (0)