diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index 3ba9c54dcd..ce24daf79f 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/CMakeLists.txt @@ -174,8 +174,8 @@ endforeach() file(REMOVE_RECURSE "${probe_dir}") if(NOT ANDROID) - ocv_list_filterout(handwritten_java_sources "/(engine|android)\\\\+") - ocv_list_filterout(handwritten_aidl_sources "/(engine|android)\\\\+") + ocv_list_filterout(handwritten_java_sources "/(engine3|android)\\\\+") + ocv_list_filterout(handwritten_aidl_sources "/(engine3|android)\\\\+") else() 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}") diff --git a/modules/java/generator/src/java/android+AsyncServiceHelper.java b/modules/java/generator/src/java/android+AsyncServiceHelper.java index e18d5a5001..9fdf5ac1f9 100644 --- a/modules/java/generator/src/java/android+AsyncServiceHelper.java +++ b/modules/java/generator/src/java/android+AsyncServiceHelper.java @@ -4,7 +4,7 @@ import java.io.File; import java.util.StringTokenizer; import org.opencv.core.Core; -import org.opencv.engine.OpenCVEngineInterface; +import org.opencv.engine3.OpenCVEngineInterface; import android.content.ComponentName; import android.content.Context; @@ -21,8 +21,8 @@ class AsyncServiceHelper final LoaderCallbackInterface Callback) { AsyncServiceHelper helper = new AsyncServiceHelper(Version, AppContext, Callback); - Intent intent = new Intent("org.opencv.engine.BIND"); - intent.setPackage("org.opencv.engine"); + Intent intent = new Intent("org.opencv.engine3.BIND"); + intent.setPackage("org.opencv.engine3"); if (AppContext.bindService(intent, helper.mServiceConnection, Context.BIND_AUTO_CREATE)) { return true; @@ -151,7 +151,7 @@ class AsyncServiceHelper /** * 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() { diff --git a/modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl b/modules/java/generator/src/java/engine3+OpenCVEngineInterface.aidl similarity index 97% rename from modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl rename to modules/java/generator/src/java/engine3+OpenCVEngineInterface.aidl index 21fe5f716b..b84eaaafb0 100644 --- a/modules/java/generator/src/java/engine+OpenCVEngineInterface.aidl +++ b/modules/java/generator/src/java/engine3+OpenCVEngineInterface.aidl @@ -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. diff --git a/platforms/android/service/engine/AndroidManifest.xml b/platforms/android/service/engine/AndroidManifest.xml index 4f78c314a8..40adb98d74 100644 --- a/platforms/android/service/engine/AndroidManifest.xml +++ b/platforms/android/service/engine/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -13,12 +13,12 @@ - + diff --git a/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp b/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp index 3e490a3160..0145abb8ce 100644 --- a/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp +++ b/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.cpp @@ -3,23 +3,23 @@ #include #include -JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetCpuID(JNIEnv* , jclass) +JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_GetCpuID(JNIEnv* , jclass) { 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(); 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(); } -JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_DetectKnownPlatforms(JNIEnv* , jclass) +JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_DetectKnownPlatforms(JNIEnv* , jclass) { return DetectKnownPlatforms(); } diff --git a/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.h b/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.h index 43fad33c86..61f294e99f 100644 --- a/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.h +++ b/platforms/android/service/engine/jni/JNIWrapper/HardwareDetector_jni.h @@ -14,7 +14,7 @@ extern "C" { * Method: GetCpuID * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetCpuID +JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_GetCpuID (JNIEnv *, jclass); /* @@ -22,7 +22,7 @@ JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetCpuID * Method: GetPlatformName * Signature: ()Ljava/lang/String; */ -JNIEXPORT jstring JNICALL Java_org_opencv_engine_HardwareDetector_GetPlatformName +JNIEXPORT jstring JNICALL Java_org_opencv_engine3_HardwareDetector_GetPlatformName (JNIEnv *, jclass); /* @@ -30,7 +30,7 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_HardwareDetector_GetPlatformNam * Method: GetProcessorCount * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetProcessorCount +JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_GetProcessorCount (JNIEnv *, jclass); /* @@ -38,7 +38,7 @@ JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_GetProcessorCount * Method: DetectKnownPlatforms * Signature: ()I */ -JNIEXPORT jint JNICALL Java_org_opencv_engine_HardwareDetector_DetectKnownPlatforms +JNIEXPORT jint JNICALL Java_org_opencv_engine3_HardwareDetector_DetectKnownPlatforms (JNIEnv *, jclass); #ifdef __cplusplus diff --git a/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp b/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp index dac4916563..1dd038125a 100644 --- a/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp +++ b/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.cpp @@ -15,7 +15,7 @@ using namespace android; sp OpenCVEngineBinder = 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"); if (NULL != OpenCVEngineBinder.get()) @@ -30,7 +30,7 @@ JNIEXPORT jobject JNICALL Java_org_opencv_engine_BinderConnector_Connect(JNIEnv* 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"); @@ -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"); diff --git a/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.h b/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.h index cd0734eb07..bfeafb0498 100644 --- a/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.h +++ b/platforms/android/service/engine/jni/JNIWrapper/OpenCVEngine_jni.h @@ -12,7 +12,7 @@ extern "C" { * Method: Connect * Signature: ()Landroid/os/IBinder; */ -JNIEXPORT jobject JNICALL Java_org_opencv_engine_BinderConnector_Connect +JNIEXPORT jobject JNICALL Java_org_opencv_engine3_BinderConnector_Connect (JNIEnv *, jobject); /* @@ -20,7 +20,7 @@ JNIEXPORT jobject JNICALL Java_org_opencv_engine_BinderConnector_Connect * Method: Init * 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); /* @@ -28,7 +28,7 @@ JNIEXPORT jboolean JNICALL Java_org_opencv_engine_BinderConnector_Init * Method: Final * Signature: ()V */ -JNIEXPORT void JNICALL Java_org_opencv_engine_BinderConnector_Final +JNIEXPORT void JNICALL Java_org_opencv_engine3_BinderConnector_Final (JNIEnv *, jobject); #ifdef __cplusplus diff --git a/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp b/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp index e7dc6d2f14..f1c5ec19a8 100644 --- a/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp +++ b/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp @@ -3,7 +3,7 @@ #include #include -JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open +JNIEXPORT jlong JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_open (JNIEnv * env, jobject, jstring str) { const char* infoLibPath = env->GetStringUTFChars(str, NULL); @@ -21,7 +21,7 @@ JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open 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) { InfoFunctionType info_func; @@ -41,7 +41,7 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageNam 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) { InfoFunctionType info_func; @@ -61,7 +61,7 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryLis 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) { InfoFunctionType info_func; @@ -81,7 +81,7 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionNam 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) { dlclose((void*)handle); diff --git a/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h b/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h index b02050ffde..574f0b4e0b 100644 --- a/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h +++ b/platforms/android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.h @@ -6,19 +6,19 @@ extern "C" { #endif -JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open +JNIEXPORT jlong JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_open (JNIEnv *, jobject, jstring); -JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName +JNIEXPORT jstring JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_getPackageName (JNIEnv *, jobject, jlong); -JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList +JNIEXPORT jstring JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_getLibraryList (JNIEnv *, jobject, jlong); -JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getVersionName +JNIEXPORT jstring JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_getVersionName (JNIEnv *, jobject, jlong); -JNIEXPORT void JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_close +JNIEXPORT void JNICALL Java_org_opencv_engine3_OpenCVLibraryInfo_close (JNIEnv *, jobject, jlong); #ifdef __cplusplus diff --git a/platforms/android/service/engine/jni/NativeService/PackageInfo.cpp b/platforms/android/service/engine/jni/NativeService/PackageInfo.cpp index d831bf7a5c..d95f9f943e 100644 --- a/platforms/android/service/engine/jni/NativeService/PackageInfo.cpp +++ b/platforms/android/service/engine/jni/NativeService/PackageInfo.cpp @@ -27,7 +27,7 @@ map PackageInfo::InitPlatformNameMap() const map PackageInfo::PlatformNameMap = InitPlatformNameMap(); 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) { diff --git a/platforms/android/service/engine/jni/include/EngineCommon.h b/platforms/android/service/engine/jni/include/EngineCommon.h index a03f02c68d..2948db8c1a 100644 --- a/platforms/android/service/engine/jni/include/EngineCommon.h +++ b/platforms/android/service/engine/jni/include/EngineCommon.h @@ -13,9 +13,9 @@ #define LIB_OPENCV_INFO_NAME "libopencv_info.so" // 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 -#define OPECV_ENGINE_CLASSNAME "org.opencv.engine.OpenCVEngineInterface" +#define OPECV_ENGINE_CLASSNAME "org.opencv.engine3.OpenCVEngineInterface" typedef const char* (*InfoFunctionType)(); diff --git a/platforms/android/service/engine/src/org/opencv/engine/BinderConnector.java b/platforms/android/service/engine/src/org/opencv/engine3/BinderConnector.java similarity index 97% rename from platforms/android/service/engine/src/org/opencv/engine/BinderConnector.java rename to platforms/android/service/engine/src/org/opencv/engine3/BinderConnector.java index bde54d5b96..a54843354e 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/BinderConnector.java +++ b/platforms/android/service/engine/src/org/opencv/engine3/BinderConnector.java @@ -1,4 +1,4 @@ -package org.opencv.engine; +package org.opencv.engine3; import android.os.IBinder; diff --git a/platforms/android/service/engine/src/org/opencv/engine/HardwareDetector.java b/platforms/android/service/engine/src/org/opencv/engine3/HardwareDetector.java similarity index 98% rename from platforms/android/service/engine/src/org/opencv/engine/HardwareDetector.java rename to platforms/android/service/engine/src/org/opencv/engine3/HardwareDetector.java index f115070aad..65ee243d3f 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/HardwareDetector.java +++ b/platforms/android/service/engine/src/org/opencv/engine3/HardwareDetector.java @@ -1,4 +1,4 @@ -package org.opencv.engine; +package org.opencv.engine3; public class HardwareDetector { diff --git a/platforms/android/service/engine/src/org/opencv/engine/MarketConnector.java b/platforms/android/service/engine/src/org/opencv/engine3/MarketConnector.java similarity index 97% rename from platforms/android/service/engine/src/org/opencv/engine/MarketConnector.java rename to platforms/android/service/engine/src/org/opencv/engine3/MarketConnector.java index da595915f2..4e5f51acc5 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/MarketConnector.java +++ b/platforms/android/service/engine/src/org/opencv/engine3/MarketConnector.java @@ -1,4 +1,4 @@ -package org.opencv.engine; +package org.opencv.engine3; import java.util.ArrayList; import java.util.Iterator; @@ -99,7 +99,7 @@ public class MarketConnector List AllPackages = mContext.getPackageManager().getInstalledPackages(PackageManager.GET_CONFIGURATIONS); List OpenCVPackages = new ArrayList(); 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) { Log.e(TAG, "OpenCV Manager package info was not found!"); e.printStackTrace(); diff --git a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl b/platforms/android/service/engine/src/org/opencv/engine3/OpenCVEngineInterface.aidl similarity index 97% rename from platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl rename to platforms/android/service/engine/src/org/opencv/engine3/OpenCVEngineInterface.aidl index 13e0f7f84f..2b957d4b07 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl +++ b/platforms/android/service/engine/src/org/opencv/engine3/OpenCVEngineInterface.aidl @@ -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. diff --git a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java b/platforms/android/service/engine/src/org/opencv/engine3/OpenCVEngineService.java similarity index 98% rename from platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java rename to platforms/android/service/engine/src/org/opencv/engine3/OpenCVEngineService.java index b3c4ea0575..c7df4a8117 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java +++ b/platforms/android/service/engine/src/org/opencv/engine3/OpenCVEngineService.java @@ -1,4 +1,4 @@ -package org.opencv.engine; +package org.opencv.engine3; import android.app.Service; import android.content.Intent; diff --git a/platforms/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java b/platforms/android/service/engine/src/org/opencv/engine3/OpenCVLibraryInfo.java similarity index 97% rename from platforms/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java rename to platforms/android/service/engine/src/org/opencv/engine3/OpenCVLibraryInfo.java index d0f67bfde0..cc36b152ad 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/OpenCVLibraryInfo.java +++ b/platforms/android/service/engine/src/org/opencv/engine3/OpenCVLibraryInfo.java @@ -1,4 +1,4 @@ -package org.opencv.engine; +package org.opencv.engine3; public class OpenCVLibraryInfo { public OpenCVLibraryInfo(String packagePath) { diff --git a/platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java b/platforms/android/service/engine/src/org/opencv/engine3/manager/ManagerActivity.java similarity index 97% rename from platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java rename to platforms/android/service/engine/src/org/opencv/engine3/manager/ManagerActivity.java index b4e0be5a91..7308e848eb 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java +++ b/platforms/android/service/engine/src/org/opencv/engine3/manager/ManagerActivity.java @@ -1,15 +1,15 @@ -package org.opencv.engine.manager; +package org.opencv.engine3.manager; import java.util.ArrayList; import java.util.HashMap; import java.util.StringTokenizer; -import org.opencv.engine.HardwareDetector; -import org.opencv.engine.MarketConnector; -import org.opencv.engine.OpenCVEngineInterface; -import org.opencv.engine.OpenCVEngineService; -import org.opencv.engine.OpenCVLibraryInfo; -import org.opencv.engine.R; +import org.opencv.engine3.HardwareDetector; +import org.opencv.engine3.MarketConnector; +import org.opencv.engine3.OpenCVEngineInterface; +import org.opencv.engine3.OpenCVEngineService; +import org.opencv.engine3.OpenCVLibraryInfo; +import org.opencv.engine3.R; import android.annotation.TargetApi; import android.app.Activity; import android.app.AlertDialog; @@ -161,7 +161,7 @@ public class ManagerActivity extends Activity mUpdateEngineButton.setOnClickListener(new OnClickListener() { 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.show(); @@ -207,7 +207,7 @@ public class ManagerActivity extends Activity public void onItemClick(AdapterView adapter, View view, int position, long id) { //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)); mActionDialog.show(); @@ -221,7 +221,7 @@ public class ManagerActivity extends Activity public void onReceive(Context context, Intent intent) { Log.d("OpenCVManager/Receiver", "Broadcast message " + intent.getAction() + " receiver"); 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)) { TextView EngineVersionView = (TextView)findViewById(R.id.EngineVersionValue); @@ -350,7 +350,7 @@ public class ManagerActivity extends Activity else NativeLibDir = "/data/data/" + mInstalledPackageInfo[i].packageName + "/lib"; - if (PackageName.equals("org.opencv.engine")) + if (PackageName.equals("org.opencv.engine3")) { OpenCVLibraryInfo NativeInfo = new OpenCVLibraryInfo(NativeLibDir); if (NativeInfo.status()) diff --git a/platforms/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java b/platforms/android/service/engine/src/org/opencv/engine3/manager/PackageListAdapter.java similarity index 96% rename from platforms/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java rename to platforms/android/service/engine/src/org/opencv/engine3/manager/PackageListAdapter.java index 17707efd36..4a929ae952 100644 --- a/platforms/android/service/engine/src/org/opencv/engine/manager/PackageListAdapter.java +++ b/platforms/android/service/engine/src/org/opencv/engine3/manager/PackageListAdapter.java @@ -1,4 +1,4 @@ -package org.opencv.engine.manager; +package org.opencv.engine3.manager; import java.util.List; import java.util.Map; diff --git a/platforms/android/service/engine_test/AndroidManifest.xml b/platforms/android/service/engine_test/AndroidManifest.xml index 5779d90a62..5ee354225a 100644 --- a/platforms/android/service/engine_test/AndroidManifest.xml +++ b/platforms/android/service/engine_test/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -8,7 +8,7 @@ + android:targetPackage="org.opencv.engine3" /> - \ No newline at end of file + diff --git a/platforms/android/service/engine_test/src/org/opencv/engine/test/EngineInterfaceTest.java b/platforms/android/service/engine_test/src/org/opencv/engine3/test/EngineInterfaceTest.java similarity index 91% rename from platforms/android/service/engine_test/src/org/opencv/engine/test/EngineInterfaceTest.java rename to platforms/android/service/engine_test/src/org/opencv/engine3/test/EngineInterfaceTest.java index d67f22faf2..b45af98a37 100644 --- a/platforms/android/service/engine_test/src/org/opencv/engine/test/EngineInterfaceTest.java +++ b/platforms/android/service/engine_test/src/org/opencv/engine3/test/EngineInterfaceTest.java @@ -1,7 +1,7 @@ -package org.opencv.engine.test; +package org.opencv.engine3.test; -import org.opencv.engine.OpenCVEngineInterface; -import org.opencv.engine.OpenCVEngineService; +import org.opencv.engine3.OpenCVEngineInterface; +import org.opencv.engine3.OpenCVEngineService; import android.content.Intent; import android.os.IBinder; @@ -18,7 +18,7 @@ public class EngineInterfaceTest extends ServiceTestCase 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); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); assertNotNull(ServiceObj); @@ -28,7 +28,7 @@ public class EngineInterfaceTest extends ServiceTestCase public void testInstallVersion() throws RemoteException { - IBinder ServiceBinder = bindService(new Intent("org.opencv.engine")); + IBinder ServiceBinder = bindService(new Intent("org.opencv.engine3")); assertNotNull(ServiceBinder); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); assertNotNull(ServiceObj); @@ -37,7 +37,7 @@ public class EngineInterfaceTest extends ServiceTestCase public void testGetPathForExistVersion() throws RemoteException { - IBinder ServiceBinder = bindService(new Intent("org.opencv.engine")); + IBinder ServiceBinder = bindService(new Intent("org.opencv.engine3")); assertNotNull(ServiceBinder); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); assertNotNull(ServiceObj); @@ -46,7 +46,7 @@ public class EngineInterfaceTest extends ServiceTestCase public void testGetPathForUnExistVersion() throws RemoteException { - IBinder ServiceBinder = bindService(new Intent("org.opencv.engine")); + IBinder ServiceBinder = bindService(new Intent("org.opencv.engine3")); assertNotNull(ServiceBinder); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); assertNotNull(ServiceObj); @@ -55,7 +55,7 @@ public class EngineInterfaceTest extends ServiceTestCase public void testInstallAndGetVersion() throws RemoteException { - IBinder ServiceBinder = bindService(new Intent("org.opencv.engine")); + IBinder ServiceBinder = bindService(new Intent("org.opencv.engine3")); assertNotNull(ServiceBinder); OpenCVEngineInterface ServiceObj = OpenCVEngineInterface.Stub.asInterface(ServiceBinder); assertNotNull(ServiceObj);