Added OpenCV references and initialization code.

This commit is contained in:
2014-01-24 12:24:51 -04:30
parent 9fd3c7d9c7
commit 9ed1a0bcc4
6 changed files with 86 additions and 4 deletions

View File

@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
--> -->
<!-- android:screenOrientation="portrait" -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ve.ucv.ciens.ccg.nxtar" package="ve.ucv.ciens.ccg.nxtar"
android:versionCode="1" android:versionCode="1"
@@ -37,7 +38,6 @@
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="portrait"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"> android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@@ -9,3 +9,4 @@
# Project target. # Project target.
target=android-19 target=android-19
android.library.reference.1=../../../../../workspace/OpenCV Library - 2.4.7

21
res/values-es/strings.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
* Copyright (C) 2013 Miguel Angel Astor Romero
*
* 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.
-->
<resources>
<string name="app_name">NxtAR</string>
<string name="ocv_failed">No se pudo inicializar OpenCV</string>
<string name="ocv_success">OpenCV inicializado con exito</string>
</resources>

View File

@@ -16,4 +16,6 @@
--> -->
<resources> <resources>
<string name="app_name">NxtAR</string> <string name="app_name">NxtAR</string>
<string name="ocv_failed">Failed to initialize OpenCV</string>
<string name="ocv_success">OpenCV initialized successfully</string>
</resources> </resources>

View File

@@ -15,9 +15,16 @@
*/ */
package ve.ucv.ciens.ccg.nxtar; package ve.ucv.ciens.ccg.nxtar;
import org.opencv.android.BaseLoaderCallback;
import org.opencv.android.CameraBridgeViewBase.CvCameraViewListener;
import org.opencv.android.LoaderCallbackInterface;
import org.opencv.android.OpenCVLoader;
import org.opencv.core.Mat;
import ve.ucv.ciens.ccg.nxtar.interfaces.MulticastEnabler; import ve.ucv.ciens.ccg.nxtar.interfaces.MulticastEnabler;
import ve.ucv.ciens.ccg.nxtar.interfaces.Toaster; import ve.ucv.ciens.ccg.nxtar.interfaces.Toaster;
import android.content.Context; import android.content.Context;
import android.content.pm.ActivityInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.MulticastLock; import android.net.wifi.WifiManager.MulticastLock;
import android.os.Bundle; import android.os.Bundle;
@@ -27,8 +34,9 @@ import android.widget.Toast;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import com.badlogic.gdx.controllers.mappings.Ouya;
public class MainActivity extends AndroidApplication implements Toaster, MulticastEnabler{ public class MainActivity extends AndroidApplication implements Toaster, MulticastEnabler, CvCameraViewListener{
private static final String TAG = "NXTAR_ANDROID_MAIN"; private static final String TAG = "NXTAR_ANDROID_MAIN";
private static final String CLASS_NAME = MainActivity.class.getSimpleName(); private static final String CLASS_NAME = MainActivity.class.getSimpleName();
@@ -36,11 +44,21 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
private MulticastLock multicastLock; private MulticastLock multicastLock;
private Handler uiHandler; private Handler uiHandler;
private Context uiContext; private Context uiContext;
private boolean ocvOn;
private BaseLoaderCallback loaderCallback;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
ocvOn = false;
if(!Ouya.runningOnOuya){
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}else{
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
}
uiHandler = new Handler(); uiHandler = new Handler();
uiContext = this; uiContext = this;
wifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE); wifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE);
@@ -51,6 +69,23 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
cfg.useCompass = false; cfg.useCompass = false;
cfg.useWakelock = true; cfg.useWakelock = true;
loaderCallback = new BaseLoaderCallback(this){
@Override
public void onManagerConnected(int status){
switch(status){
case LoaderCallbackInterface.SUCCESS:
ocvOn = true;
Toast.makeText(uiContext, R.string.ocv_success, Toast.LENGTH_LONG).show();
break;
default:
Toast.makeText(uiContext, R.string.ocv_failed, Toast.LENGTH_LONG).show();
Gdx.app.exit();
break;
}
}
};
OpenCVLoader.initAsync(OpenCVLoader.OPENCV_VERSION_2_4_7, this, loaderCallback);
initialize(new NxtARCore(this), cfg); initialize(new NxtARCore(this), cfg);
} }
@@ -82,7 +117,7 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
///////////////////////////////////////// /////////////////////////////////////////
@Override @Override
public void enableMulticast(){ public void enableMulticast(){
Gdx.app.debug(TAG, CLASS_NAME + ".enableMulticast() :: Requesting multicast lock."); Gdx.app.log(TAG, CLASS_NAME + ".enableMulticast() :: Requesting multicast lock.");
multicastLock = wifiManager.createMulticastLock(TAG); multicastLock = wifiManager.createMulticastLock(TAG);
multicastLock.setReferenceCounted(true); multicastLock.setReferenceCounted(true);
multicastLock.acquire(); multicastLock.acquire();
@@ -90,10 +125,33 @@ public class MainActivity extends AndroidApplication implements Toaster, Multica
@Override @Override
public void disableMulticast() { public void disableMulticast() {
Gdx.app.debug(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();
multicastLock = null; multicastLock = null;
} }
} }
/////////////////////////////////////////////
// CvCameraViewListener interface methods. //
/////////////////////////////////////////////
/**
* <p>This method does nothing. It is here because it must be implemented in order to use OpenCV.</p>
*/
@Override
public void onCameraViewStarted(int width, int height){ }
/**
* <p>This method does nothing. It is here because it must be implemented in order to use OpenCV.</p>
*/
@Override
public void onCameraViewStopped(){ }
/**
* <p>This method does nothing. It is here because it must be implemented in order to use OpenCV.</p>
*/
@Override
public Mat onCameraFrame(Mat inputFrame){
return null;
}
} }