WallyHackenslacker/NxtAR-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'robot_control' into develop

Browse Source
This commit is contained in:
Wally Hackenslacker
2014-02-11 17:50:01 -04:30
parent db6befbee9 e87c59db48
commit 2028c74904
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/data/gfx/gui/orange_glowy_button.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

21
src/ve/ucv/ciens/ccg/nxtar/MainActivity.java
View File

@@ -47,14 +47,14 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
private boolean ocvOn; private boolean ocvOn;
private BaseLoaderCallback loaderCallback; private BaseLoaderCallback loaderCallback;
/*static { /*static{
if (!OpenCVLoader.initDebug()) { if (!OpenCVLoader.initDebug()){
Gdx.app.exit(); Gdx.app.exit();
} }
}*/ }*/
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
ocvOn = false; ocvOn = false;
@@ -81,7 +81,6 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
switch(status){ switch(status){
case LoaderCallbackInterface.SUCCESS: case LoaderCallbackInterface.SUCCESS:
ocvOn = true; ocvOn = true;
Toast.makeText(uiContext, R.string.ocv_success, Toast.LENGTH_LONG).show();
break; break;
default: default:
Toast.makeText(uiContext, R.string.ocv_failed, Toast.LENGTH_LONG).show(); Toast.makeText(uiContext, R.string.ocv_failed, Toast.LENGTH_LONG).show();
@@ -99,20 +98,20 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
// Toaster interface methods. // // Toaster interface methods. //
//////////////////////////////// ////////////////////////////////
@Override @Override
public void showShortToast(final String msg) { public void showShortToast(final String msg){
uiHandler.post(new Runnable() { uiHandler.post(new Runnable(){
@Override @Override
public void run() { public void run(){
Toast.makeText(uiContext, msg, Toast.LENGTH_SHORT).show(); Toast.makeText(uiContext, msg, Toast.LENGTH_SHORT).show();
} }
}); });
} }
@Override @Override
public void showLongToast(final String msg) { public void showLongToast(final String msg){
uiHandler.post(new Runnable() { uiHandler.post(new Runnable(){
@Override @Override
public void run() { public void run(){
Toast.makeText(uiContext, msg, Toast.LENGTH_LONG).show(); Toast.makeText(uiContext, msg, Toast.LENGTH_LONG).show();
} }
}); });
@@ -130,7 +129,7 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
} }
@Override @Override
public void disableMulticast() { public void disableMulticast(){
Gdx.app.log(TAG, CLASS_NAME + ".disableMulticast() :: Releasing multicast lock."); Gdx.app.log(TAG, CLASS_NAME + ".disableMulticast() :: Releasing multicast lock.");
if(multicastLock != null){ if(multicastLock != null){
multicastLock.release(); multicastLock.release();