generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename OpenCV Engine to org.opencv.engine3 for release candidate

Browse Source
This commit is contained in:
Maksim Shabunin
2015-04-17 16:00:33 +03:00
parent b639353193
commit 316d76bdb6
22 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/java/CMakeLists.txt
View File

@@ -174,8 +174,8 @@ endforeach()
file(REMOVE_RECURSE "${probe_dir}") file(REMOVE_RECURSE "${probe_dir}")
if(NOT ANDROID) if(NOT ANDROID)
ocv_list_filterout(handwritten_java_sources "/(engine|android)\\\\+") ocv_list_filterout(handwritten_java_sources "/(engine3|android)\\\\+")
ocv_list_filterout(handwritten_aidl_sources "/(engine|android)\\\\+") ocv_list_filterout(handwritten_aidl_sources "/(engine3|android)\\\\+")
else() else()
file(GLOB_RECURSE handwrittren_lib_project_files_rel RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/" "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/*") file(GLOB_RECURSE handwrittren_lib_project_files_rel RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/" "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/*")
list(REMOVE_ITEM handwrittren_lib_project_files_rel "${ANDROID_MANIFEST_FILE}") list(REMOVE_ITEM handwrittren_lib_project_files_rel "${ANDROID_MANIFEST_FILE}")

8
modules/java/generator/src/java/android+AsyncServiceHelper.java
View File

@@ -4,7 +4,7 @@ import java.io.File;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.opencv.core.Core; import org.opencv.core.Core;
import org.opencv.engine.OpenCVEngineInterface; import org.opencv.engine3.OpenCVEngineInterface;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
@@ -21,8 +21,8 @@ class AsyncServiceHelper
final LoaderCallbackInterface Callback) final LoaderCallbackInterface Callback)
{ {
AsyncServiceHelper helper = new AsyncServiceHelper(Version, AppContext, Callback); AsyncServiceHelper helper = new AsyncServiceHelper(Version, AppContext, Callback);
Intent intent = new Intent("org.opencv.engine.BIND"); Intent intent = new Intent("org.opencv.engine3.BIND");
intent.setPackage("org.opencv.engine"); intent.setPackage("org.opencv.engine3");
if (AppContext.bindService(intent, helper.mServiceConnection, Context.BIND_AUTO_CREATE)) if (AppContext.bindService(intent, helper.mServiceConnection, Context.BIND_AUTO_CREATE))
{ {
return true; return true;
@@ -151,7 +151,7 @@ class AsyncServiceHelper
/** /**
* URL of OpenCV Manager page on Google Play Market. * URL of OpenCV Manager page on Google Play Market.
*/ */
protected static final String OPEN_CV_SERVICE_URL = "market://details?id=org.opencv.engine"; protected static final String OPEN_CV_SERVICE_URL = "market://details?id=org.opencv.engine3";
protected ServiceConnection mServiceConnection = new ServiceConnection() protected ServiceConnection mServiceConnection = new ServiceConnection()
{ {

2
modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl → modules/java/generator/src/java/engine3+OpenCVEngineInterface.aidl
View File

@@ -1,4 +1,4 @@
package org.opencv.engine; package org.opencv.engine3;
/** /**
* Class provides a Java interface for OpenCV Engine Service. It's synchronous with native OpenCVEngine class. * Class provides a Java interface for OpenCV Engine Service. It's synchronous with native OpenCVEngine class.

6
platforms/android/service/engine/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.engine" package="org.opencv.engine3"
android:versionCode="300@ANDROID_PLATFORM_VERSION_CODE@" android:versionCode="300@ANDROID_PLATFORM_VERSION_CODE@"
android:versionName="3.00" > android:versionName="3.00" >
@@ -13,12 +13,12 @@
<service android:exported="true" android:name="OpenCVEngineService" android:process=":OpenCVEngineProcess"> <service android:exported="true" android:name="OpenCVEngineService" android:process=":OpenCVEngineProcess">
<intent-filter> <intent-filter>
<action android:name="org.opencv.engine.BIND"></action> <action android:name="org.opencv.engine3.BIND"></action>
</intent-filter> </intent-filter>
</service> </service>
<activity <activity
android:name="org.opencv.engine.manager.ManagerActivity" android:name="org.opencv.engine3.manager.ManagerActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="portrait"> android:screenOrientation="portrait">
<intent-filter> <intent-filter>

8
platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp
View File

@@ -3,23 +3,23 @@
#include <jni.h> #include <jni.h>
#include <string> #include <string>
JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetCpuID(JNIEnv* , jclass) JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_GetCpuID(JNIEnv* , jclass)
{ {
return GetCpuID(); return GetCpuID();
} }
JNIEXPORT jstring JNICALL Java_org_opencv_engine_HardwareDetector_GetPlatformName(JNIEnv* env, jclass) JNIEXPORT jstring JNICALL Java_org_opencv_engine3_HardwareDetector_GetPlatformName(JNIEnv* env, jclass)
{ {
std::string hardware_name = GetPlatformName(); std::string hardware_name = GetPlatformName();
return env->NewStringUTF(hardware_name.c_str()); return env->NewStringUTF(hardware_name.c_str());
} }
JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetProcessorCount(JNIEnv* , jclass) JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_GetProcessorCount(JNIEnv* , jclass)
{ {
return GetProcessorCount(); return GetProcessorCount();
} }
JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_DetectKnownPlatforms(JNIEnv* , jclass) JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_DetectKnownPlatforms(JNIEnv* , jclass)
{ {
return DetectKnownPlatforms(); return DetectKnownPlatforms();
} }

8
platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.h
View File

@@ -14,7 +14,7 @@ extern "C" {
* Method: GetCpuID * Method: GetCpuID
* Signature: ()I * Signature: ()I
*/ */
JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetCpuID JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_GetCpuID
(JNIEnv *, jclass); (JNIEnv *, jclass);
/* /*
@@ -22,7 +22,7 @@ JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetCpuID
* Method: GetPlatformName * Method: GetPlatformName
* Signature: ()Ljava/lang/String; * Signature: ()Ljava/lang/String;
*/ */
JNIEXPORT jstring JNICALL Java_org_opencv_engine_HardwareDetector_GetPlatformName JNIEXPORT jstring JNICALL Java_org_opencv_engine3_HardwareDetector_GetPlatformName
(JNIEnv *, jclass); (JNIEnv *, jclass);
/* /*
@@ -30,7 +30,7 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_HardwareDetector_GetPlatformNam
* Method: GetProcessorCount * Method: GetProcessorCount
* Signature: ()I * Signature: ()I
*/ */
JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetProcessorCount JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_GetProcessorCount
(JNIEnv *, jclass); (JNIEnv *, jclass);
/* /*
@@ -38,7 +38,7 @@ JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetProcessorCount
* Method: DetectKnownPlatforms * Method: DetectKnownPlatforms
* Signature: ()I * Signature: ()I
*/ */
JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_DetectKnownPlatforms JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_DetectKnownPlatforms
(JNIEnv *, jclass); (JNIEnv *, jclass);
#ifdef __cplusplus #ifdef __cplusplus

6
platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp
View File

@@ -15,7 +15,7 @@ using namespace android;
sp<IBinder> OpenCVEngineBinder = NULL; sp<IBinder> OpenCVEngineBinder = NULL;
IPackageManager* PackageManager = NULL; IPackageManager* PackageManager = NULL;
JNIEXPORT jobject JNICALL Java_org_opencv_engine_BinderConnector_Connect(JNIEnv* env, jobject) JNIEXPORT jobject JNICALL Java_org_opencv_engine3_BinderConnector_Connect(JNIEnv* env, jobject)
{ {
LOGI("Creating new component"); LOGI("Creating new component");
if (NULL != OpenCVEngineBinder.get()) if (NULL != OpenCVEngineBinder.get())
@@ -30,7 +30,7 @@ JNIEXPORT jobject JNICALL Java_org_opencv_engine_BinderConnector_Connect(JNIEnv*
return javaObjectForIBinder(env, OpenCVEngineBinder); return javaObjectForIBinder(env, OpenCVEngineBinder);
} }
JNIEXPORT jboolean JNICALL Java_org_opencv_engine_BinderConnector_Init(JNIEnv* env, jobject , jobject market) JNIEXPORT jboolean JNICALL Java_org_opencv_engine3_BinderConnector_Init(JNIEnv* env, jobject , jobject market)
{ {
LOGD("Java_org_opencv_engine_BinderConnector_Init"); LOGD("Java_org_opencv_engine_BinderConnector_Init");
@@ -58,7 +58,7 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_engine_BinderConnector_Init(JNIEnv* e
} }
} }
JNIEXPORT void JNICALL Java_org_opencv_engine_BinderConnector_Final(JNIEnv *, jobject) JNIEXPORT void JNICALL Java_org_opencv_engine3_BinderConnector_Final(JNIEnv *, jobject)
{ {
LOGD("Java_org_opencv_engine_BinderConnector_Final"); LOGD("Java_org_opencv_engine_BinderConnector_Final");

6
platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.h
View File

@@ -12,7 +12,7 @@ extern "C" {
* Method: Connect * Method: Connect
* Signature: ()Landroid/os/IBinder; * Signature: ()Landroid/os/IBinder;
*/ */
JNIEXPORT jobject JNICALL Java_org_opencv_engine_BinderConnector_Connect JNIEXPORT jobject JNICALL Java_org_opencv_engine3_BinderConnector_Connect
(JNIEnv *, jobject); (JNIEnv *, jobject);
/* /*
@@ -20,7 +20,7 @@ JNIEXPORT jobject JNICALL Java_org_opencv_engine_BinderConnector_Connect
* Method: Init * Method: Init
* Signature: (Lorg/opencv/engine/MarketConnector;)Z * Signature: (Lorg/opencv/engine/MarketConnector;)Z
*/ */
JNIEXPORT jboolean JNICALL Java_org_opencv_engine_BinderConnector_Init JNIEXPORT jboolean JNICALL Java_org_opencv_engine3_BinderConnector_Init
(JNIEnv *, jobject, jobject); (JNIEnv *, jobject, jobject);
/* /*
@@ -28,7 +28,7 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_engine_BinderConnector_Init
* Method: Final * Method: Final
* Signature: ()V * Signature: ()V
*/ */
JNIEXPORT void JNICALL Java_org_opencv_engine_BinderConnector_Final JNIEXPORT void JNICALL Java_org_opencv_engine3_BinderConnector_Final
(JNIEnv *, jobject); (JNIEnv *, jobject);
#ifdef __cplusplus #ifdef __cplusplus

10
platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
View File

@@ -3,7 +3,7 @@
#include <utils/Log.h> #include <utils/Log.h>
#include <dlfcn.h> #include <dlfcn.h>
JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open JNIEXPORT jlong JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_open
(JNIEnv * env, jobject, jstring str) (JNIEnv * env, jobject, jstring str)
{ {
const char* infoLibPath = env->GetStringUTFChars(str, NULL); const char* infoLibPath = env->GetStringUTFChars(str, NULL);
@@ -21,7 +21,7 @@ JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open
return (jlong)handle; return (jlong)handle;
} }
JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName JNIEXPORT jstring JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_getPackageName
(JNIEnv* env, jobject, jlong handle) (JNIEnv* env, jobject, jlong handle)
{ {
InfoFunctionType info_func; InfoFunctionType info_func;
@@ -41,7 +41,7 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageNam
return env->NewStringUTF(result); return env->NewStringUTF(result);
} }
JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList JNIEXPORT jstring JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_getLibraryList
(JNIEnv* env, jobject, jlong handle) (JNIEnv* env, jobject, jlong handle)
{ {
InfoFunctionType info_func; InfoFunctionType info_func;
@@ -61,7 +61,7 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryLis
return env->NewStringUTF(result); return env->NewStringUTF(result);
} }
JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionName JNIEXPORT jstring JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_getVersionName
(JNIEnv* env, jobject, jlong handle) (JNIEnv* env, jobject, jlong handle)
{ {
InfoFunctionType info_func; InfoFunctionType info_func;
@@ -81,7 +81,7 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionNam
return env->NewStringUTF(result); return env->NewStringUTF(result);
} }
JNIEXPORT void JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_close JNIEXPORT void JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_close
(JNIEnv*, jobject, jlong handle) (JNIEnv*, jobject, jlong handle)
{ {
dlclose((void*)handle); dlclose((void*)handle);

10
platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h
View File

@@ -6,19 +6,19 @@
extern "C" { extern "C" {
#endif #endif
JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open JNIEXPORT jlong JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_open
(JNIEnv *, jobject, jstring); (JNIEnv *, jobject, jstring);
JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName JNIEXPORT jstring JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_getPackageName
(JNIEnv *, jobject, jlong); (JNIEnv *, jobject, jlong);
JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList JNIEXPORT jstring JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_getLibraryList
(JNIEnv *, jobject, jlong); (JNIEnv *, jobject, jlong);
JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionName JNIEXPORT jstring JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_getVersionName
(JNIEnv *, jobject, jlong); (JNIEnv *, jobject, jlong);
JNIEXPORT void JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_close JNIEXPORT void JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_close
(JNIEnv *, jobject, jlong); (JNIEnv *, jobject, jlong);
#ifdef __cplusplus #ifdef __cplusplus

2
platforms/android/service/engine/jni/NativeService/PackageInfo.cpp
View File

@@ -27,7 +27,7 @@ map<int, string> PackageInfo::InitPlatformNameMap()
const map<int, string> PackageInfo::PlatformNameMap = InitPlatformNameMap(); const map<int, string> PackageInfo::PlatformNameMap = InitPlatformNameMap();
const string PackageInfo::BasePackageName = "org.opencv.lib"; const string PackageInfo::BasePackageName = "org.opencv.lib";
const string DEFAULT_ENGINE_INSTALL_PATH = "/data/data/org.opencv.engine"; const string DEFAULT_ENGINE_INSTALL_PATH = "/data/data/org.opencv.engine3";
inline string JoinARMFeatures(int cpu_id) inline string JoinARMFeatures(int cpu_id)
{ {

4
platforms/android/service/engine/jni/include/EngineCommon.h
View File

@@ -13,9 +13,9 @@
#define LIB_OPENCV_INFO_NAME "libopencv_info.so" #define LIB_OPENCV_INFO_NAME "libopencv_info.so"
// OpenCV Manager package name // OpenCV Manager package name
#define OPENCV_ENGINE_PACKAGE "org.opencv.engine" #define OPENCV_ENGINE_PACKAGE "org.opencv.engine3"
// Class name of OpenCV engine binder object. Is needned for connection to service // Class name of OpenCV engine binder object. Is needned for connection to service
#define OPECV_ENGINE_CLASSNAME "org.opencv.engine.OpenCVEngineInterface" #define OPECV_ENGINE_CLASSNAME "org.opencv.engine3.OpenCVEngineInterface"
typedef const char* (*InfoFunctionType)(); typedef const char* (*InfoFunctionType)();

2
platforms/android/service/engine/src/org/opencv/engine/BinderConnector.java → platforms/android/service/engine/src/org/opencv/engine3/BinderConnector.java
View File

@@ -1,4 +1,4 @@
package org.opencv.engine; package org.opencv.engine3;
import android.os.IBinder; import android.os.IBinder;

2
platforms/android/service/engine/src/org/opencv/engine/HardwareDetector.java → platforms/android/service/engine/src/org/opencv/engine3/HardwareDetector.java
View File

@@ -1,4 +1,4 @@
package org.opencv.engine; package org.opencv.engine3;
public class HardwareDetector public class HardwareDetector
{ {

4
platforms/android/service/engine/src/org/opencv/engine/MarketConnector.java → platforms/android/service/engine/src/org/opencv/engine3/MarketConnector.java
View File

@@ -1,4 +1,4 @@
package org.opencv.engine; package org.opencv.engine3;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
@@ -99,7 +99,7 @@ public class MarketConnector
List<PackageInfo> AllPackages = mContext.getPackageManager().getInstalledPackages(PackageManager.GET_CONFIGURATIONS); List<PackageInfo> AllPackages = mContext.getPackageManager().getInstalledPackages(PackageManager.GET_CONFIGURATIONS);
List<PackageInfo> OpenCVPackages = new ArrayList<PackageInfo>(); List<PackageInfo> OpenCVPackages = new ArrayList<PackageInfo>();
try { try {
OpenCVPackages.add(mContext.getPackageManager().getPackageInfo("org.opencv.engine", PackageManager.GET_CONFIGURATIONS)); OpenCVPackages.add(mContext.getPackageManager().getPackageInfo("org.opencv.engine3", PackageManager.GET_CONFIGURATIONS));
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
Log.e(TAG, "OpenCV Manager package info was not found!"); Log.e(TAG, "OpenCV Manager package info was not found!");
e.printStackTrace(); e.printStackTrace();

2
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl → platforms/android/service/engine/src/org/opencv/engine3/OpenCVEngineInterface.aidl
View File

@@ -1,4 +1,4 @@
package org.opencv.engine; package org.opencv.engine3;
/** /**
* Class provides Java interface to OpenCV Engine Service. Is synchronious with native OpenCVEngine class. * Class provides Java interface to OpenCV Engine Service. Is synchronious with native OpenCVEngine class.

2
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java → platforms/android/service/engine/src/org/opencv/engine3/OpenCVEngineService.java
View File

@@ -1,4 +1,4 @@
package org.opencv.engine; package org.opencv.engine3;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;

2
platforms/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java → platforms/android/service/engine/src/org/opencv/engine3/OpenCVLibraryInfo.java
View File

@@ -1,4 +1,4 @@
package org.opencv.engine; package org.opencv.engine3;
public class OpenCVLibraryInfo { public class OpenCVLibraryInfo {
public OpenCVLibraryInfo(String packagePath) { public OpenCVLibraryInfo(String packagePath) {

22
platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java → platforms/android/service/engine/src/org/opencv/engine3/manager/ManagerActivity.java
View File

@@ -1,15 +1,15 @@
package org.opencv.engine.manager; package org.opencv.engine3.manager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.opencv.engine.HardwareDetector; import org.opencv.engine3.HardwareDetector;
import org.opencv.engine.MarketConnector; import org.opencv.engine3.MarketConnector;
import org.opencv.engine.OpenCVEngineInterface; import org.opencv.engine3.OpenCVEngineInterface;
import org.opencv.engine.OpenCVEngineService; import org.opencv.engine3.OpenCVEngineService;
import org.opencv.engine.OpenCVLibraryInfo; import org.opencv.engine3.OpenCVLibraryInfo;
import org.opencv.engine.R; import org.opencv.engine3.R;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
@@ -161,7 +161,7 @@ public class ManagerActivity extends Activity
mUpdateEngineButton.setOnClickListener(new OnClickListener() { mUpdateEngineButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
if (!mMarket.InstallAppFromMarket("org.opencv.engine")) if (!mMarket.InstallAppFromMarket("org.opencv.engine3"))
{ {
Toast toast = Toast.makeText(getApplicationContext(), "Google Play is not avaliable", Toast.LENGTH_SHORT); Toast toast = Toast.makeText(getApplicationContext(), "Google Play is not avaliable", Toast.LENGTH_SHORT);
toast.show(); toast.show();
@@ -207,7 +207,7 @@ public class ManagerActivity extends Activity
public void onItemClick(AdapterView<?> adapter, View view, int position, long id) { public void onItemClick(AdapterView<?> adapter, View view, int position, long id) {
//if (!mListViewItems.get((int) id).get("Name").equals("Built-in OpenCV library")); //if (!mListViewItems.get((int) id).get("Name").equals("Built-in OpenCV library"));
if (!mInstalledPackageInfo[(int) id].packageName.equals("org.opencv.engine")) if (!mInstalledPackageInfo[(int) id].packageName.equals("org.opencv.engine3"))
{ {
mInstalledPackageView.setTag(Integer.valueOf((int)id)); mInstalledPackageView.setTag(Integer.valueOf((int)id));
mActionDialog.show(); mActionDialog.show();
@@ -221,7 +221,7 @@ public class ManagerActivity extends Activity
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
Log.d("OpenCVManager/Receiver", "Broadcast message " + intent.getAction() + " receiver"); Log.d("OpenCVManager/Receiver", "Broadcast message " + intent.getAction() + " receiver");
Log.d("OpenCVManager/Receiver", "Filling package list on broadcast message"); Log.d("OpenCVManager/Receiver", "Filling package list on broadcast message");
if (!bindService(new Intent("org.opencv.engine.BIND"), if (!bindService(new Intent("org.opencv.engine3.BIND"),
new OpenCVEngineServiceConnection(), Context.BIND_AUTO_CREATE)) new OpenCVEngineServiceConnection(), Context.BIND_AUTO_CREATE))
{ {
TextView EngineVersionView = (TextView)findViewById(R.id.EngineVersionValue); TextView EngineVersionView = (TextView)findViewById(R.id.EngineVersionValue);
@@ -350,7 +350,7 @@ public class ManagerActivity extends Activity
else else
NativeLibDir = "/data/data/" + mInstalledPackageInfo[i].packageName + "/lib"; NativeLibDir = "/data/data/" + mInstalledPackageInfo[i].packageName + "/lib";
if (PackageName.equals("org.opencv.engine")) if (PackageName.equals("org.opencv.engine3"))
{ {
OpenCVLibraryInfo NativeInfo = new OpenCVLibraryInfo(NativeLibDir); OpenCVLibraryInfo NativeInfo = new OpenCVLibraryInfo(NativeLibDir);
if (NativeInfo.status()) if (NativeInfo.status())

2
platforms/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java → platforms/android/service/engine/src/org/opencv/engine3/manager/PackageListAdapter.java
View File

@@ -1,4 +1,4 @@
package org.opencv.engine.manager; package org.opencv.engine3.manager;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

4
platforms/android/service/engine_test/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.engine.test" package="org.opencv.engine3.test"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0" > android:versionName="1.0" >
@@ -8,7 +8,7 @@
<instrumentation <instrumentation
android:name="android.test.InstrumentationTestRunner" android:name="android.test.InstrumentationTestRunner"
android:targetPackage="org.opencv.engine" /> android:targetPackage="org.opencv.engine3" />
<application <application
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"

16
platforms/android/service/engine_test/src/org/opencv/engine/test/EngineInterfaceTest.java → platforms/android/service/engine_test/src/org/opencv/engine3/test/EngineInterfaceTest.java
View File

@@ -1,7 +1,7 @@
package org.opencv.engine.test; package org.opencv.engine3.test;
import org.opencv.engine.OpenCVEngineInterface; import org.opencv.engine3.OpenCVEngineInterface;
import org.opencv.engine.OpenCVEngineService; import org.opencv.engine3.OpenCVEngineService;
import android.content.Intent; import android.content.Intent;
import android.os.IBinder; import android.os.IBinder;
@@ -18,7 +18,7 @@ public class EngineInterfaceTest extends ServiceTestCase<OpenCVEngineService>
public void testVersion() throws RemoteException public void testVersion() throws RemoteException
{ {
IBinder ServiceBinder = bindService(new Intent("org.opencv.engine.BIND")); IBinder ServiceBinder = bindService(new Intent("org.opencv.engine3.BIND"));
assertNotNull(ServiceBinder); assertNotNull(ServiceBinder);
OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder);
assertNotNull(ServiceObj); assertNotNull(ServiceObj);
@@ -28,7 +28,7 @@ public class EngineInterfaceTest extends ServiceTestCase<OpenCVEngineService>
public void testInstallVersion() throws RemoteException public void testInstallVersion() throws RemoteException
{ {
IBinder ServiceBinder = bindService(new Intent("org.opencv.engine")); IBinder ServiceBinder = bindService(new Intent("org.opencv.engine3"));
assertNotNull(ServiceBinder); assertNotNull(ServiceBinder);
OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder);
assertNotNull(ServiceObj); assertNotNull(ServiceObj);
@@ -37,7 +37,7 @@ public class EngineInterfaceTest extends ServiceTestCase<OpenCVEngineService>
public void testGetPathForExistVersion() throws RemoteException public void testGetPathForExistVersion() throws RemoteException
{ {
IBinder ServiceBinder = bindService(new Intent("org.opencv.engine")); IBinder ServiceBinder = bindService(new Intent("org.opencv.engine3"));
assertNotNull(ServiceBinder); assertNotNull(ServiceBinder);
OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder);
assertNotNull(ServiceObj); assertNotNull(ServiceObj);
@@ -46,7 +46,7 @@ public class EngineInterfaceTest extends ServiceTestCase<OpenCVEngineService>
public void testGetPathForUnExistVersion() throws RemoteException public void testGetPathForUnExistVersion() throws RemoteException
{ {
IBinder ServiceBinder = bindService(new Intent("org.opencv.engine")); IBinder ServiceBinder = bindService(new Intent("org.opencv.engine3"));
assertNotNull(ServiceBinder); assertNotNull(ServiceBinder);
OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder);
assertNotNull(ServiceObj); assertNotNull(ServiceObj);
@@ -55,7 +55,7 @@ public class EngineInterfaceTest extends ServiceTestCase<OpenCVEngineService>
public void testInstallAndGetVersion() throws RemoteException public void testInstallAndGetVersion() throws RemoteException
{ {
IBinder ServiceBinder = bindService(new Intent("org.opencv.engine")); IBinder ServiceBinder = bindService(new Intent("org.opencv.engine3"));
assertNotNull(ServiceBinder); assertNotNull(ServiceBinder);
OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder);
assertNotNull(ServiceObj); assertNotNull(ServiceObj);