From 2830551e89ce0c0aac8d99908e8261f3da175735 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Wed, 22 Nov 2023 13:52:41 +0300 Subject: [PATCH] Drop OpenCV Manager from samples initialization. --- CMakeLists.txt | 4 - .../opencv/android/AsyncServiceHelper.java | 391 ------------------ .../opencv/android/BaseLoaderCallback.java | 141 ------- .../android/InstallCallbackInterface.java | 34 -- .../android/LoaderCallbackInterface.java | 40 -- .../org/opencv/android/OpenCVLoader.java.in | 110 +---- .../opencv/engine/OpenCVEngineInterface.aidl | 33 -- platforms/android/service/CMakeLists.txt | 10 - .../service/engine/AndroidManifest.xml | 30 -- .../android/service/engine/CMakeLists.txt | 3 - .../service/engine/res/drawable/icon.png | Bin 1997 -> 0 bytes .../service/engine/res/layout/main.xml | 49 --- .../service/engine/res/values/strings.xml | 7 - .../org/opencv/engine/HardwareDetector.java | 118 ------ .../org/opencv/engine/MarketConnector.java | 31 -- .../opencv/engine/OpenCVEngineInterface.aidl | 33 -- .../opencv/engine/OpenCVEngineService.java | 165 -------- .../engine/manager/ManagerActivity.java | 113 ----- platforms/android/service/readme.txt | 25 -- .../samples/puzzle15/Puzzle15Activity.java | 42 +- .../CameraCalibrationActivity.java | 38 +- .../ColorBlobDetectionActivity.java | 39 +- .../opencv/samples/facedetect/FdActivity.java | 107 +++-- .../ImageManipulationsActivity.java | 38 +- .../opencv_mobilenet/MainActivity.java | 33 +- .../samples/tutorial1/Tutorial1Activity.java | 38 +- .../samples/tutorial2/Tutorial2Activity.java | 42 +- .../samples/tutorial3/Tutorial3Activity.java | 38 +- 28 files changed, 154 insertions(+), 1598 deletions(-) delete mode 100644 modules/java/generator/android/java/org/opencv/android/AsyncServiceHelper.java delete mode 100644 modules/java/generator/android/java/org/opencv/android/BaseLoaderCallback.java delete mode 100644 modules/java/generator/android/java/org/opencv/android/InstallCallbackInterface.java delete mode 100644 modules/java/generator/android/java/org/opencv/android/LoaderCallbackInterface.java delete mode 100644 modules/java/generator/android/java/org/opencv/engine/OpenCVEngineInterface.aidl delete mode 100644 platforms/android/service/CMakeLists.txt delete mode 100644 platforms/android/service/engine/AndroidManifest.xml delete mode 100644 platforms/android/service/engine/CMakeLists.txt delete mode 100644 platforms/android/service/engine/res/drawable/icon.png delete mode 100644 platforms/android/service/engine/res/layout/main.xml delete mode 100644 platforms/android/service/engine/res/values/strings.xml delete mode 100644 platforms/android/service/engine/src/org/opencv/engine/HardwareDetector.java delete mode 100644 platforms/android/service/engine/src/org/opencv/engine/MarketConnector.java delete mode 100644 platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl delete mode 100644 platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineService.java delete mode 100644 platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java delete mode 100644 platforms/android/service/readme.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 49c93d2406..f614bae777 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -987,10 +987,6 @@ if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_ANDROID_EXAMPLES OR INSTA add_subdirectory(samples) endif() -if(ANDROID) - add_subdirectory(platforms/android/service) -endif() - # ---------------------------------------------------------------------------- # Finalization: generate configuration-based files # ---------------------------------------------------------------------------- diff --git a/modules/java/generator/android/java/org/opencv/android/AsyncServiceHelper.java b/modules/java/generator/android/java/org/opencv/android/AsyncServiceHelper.java deleted file mode 100644 index cb3c6428d1..0000000000 --- a/modules/java/generator/android/java/org/opencv/android/AsyncServiceHelper.java +++ /dev/null @@ -1,391 +0,0 @@ -package org.opencv.android; - -import java.io.File; -import java.util.StringTokenizer; - -import org.opencv.core.Core; -import org.opencv.engine.OpenCVEngineInterface; - -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.content.ServiceConnection; -import android.net.Uri; -import android.os.IBinder; -import android.os.RemoteException; -import android.util.Log; - -class AsyncServiceHelper -{ - public static boolean initOpenCV(String Version, final Context AppContext, - final LoaderCallbackInterface Callback) - { - AsyncServiceHelper helper = new AsyncServiceHelper(Version, AppContext, Callback); - Intent intent = new Intent("org.opencv.engine.BIND"); - intent.setPackage("org.opencv.engine"); - if (AppContext.bindService(intent, helper.mServiceConnection, Context.BIND_AUTO_CREATE)) - { - return true; - } - else - { - AppContext.unbindService(helper.mServiceConnection); - InstallService(AppContext, Callback); - return false; - } - } - - protected AsyncServiceHelper(String Version, Context AppContext, LoaderCallbackInterface Callback) - { - mOpenCVersion = Version; - mUserAppCallback = Callback; - mAppContext = AppContext; - } - - protected static final String TAG = "OpenCVManager/Helper"; - protected static final int MINIMUM_ENGINE_VERSION = 2; - protected OpenCVEngineInterface mEngineService; - protected LoaderCallbackInterface mUserAppCallback; - protected String mOpenCVersion; - protected Context mAppContext; - protected static boolean mServiceInstallationProgress = false; - protected static boolean mLibraryInstallationProgress = false; - - protected static boolean InstallServiceQuiet(Context context) - { - boolean result = true; - try - { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(OPEN_CV_SERVICE_URL)); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(intent); - } - catch(Exception e) - { - result = false; - } - - return result; - } - - protected static void InstallService(final Context AppContext, final LoaderCallbackInterface Callback) - { - if (!mServiceInstallationProgress) - { - Log.d(TAG, "Request new service installation"); - InstallCallbackInterface InstallQuery = new InstallCallbackInterface() { - private LoaderCallbackInterface mUserAppCallback = Callback; - public String getPackageName() - { - return "OpenCV Manager"; - } - public void install() { - Log.d(TAG, "Trying to install OpenCV Manager via Google Play"); - - boolean result = InstallServiceQuiet(AppContext); - if (result) - { - mServiceInstallationProgress = true; - Log.d(TAG, "Package installation started"); - } - else - { - Log.d(TAG, "OpenCV package was not installed!"); - int Status = LoaderCallbackInterface.MARKET_ERROR; - Log.d(TAG, "Init finished with status " + Status); - Log.d(TAG, "Unbind from service"); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(Status); - } - } - - public void cancel() - { - Log.d(TAG, "OpenCV library installation was canceled"); - int Status = LoaderCallbackInterface.INSTALL_CANCELED; - Log.d(TAG, "Init finished with status " + Status); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(Status); - } - - public void wait_install() - { - Log.e(TAG, "Installation was not started! Nothing to wait!"); - } - }; - - Callback.onPackageInstall(InstallCallbackInterface.NEW_INSTALLATION, InstallQuery); - } - else - { - Log.d(TAG, "Waiting current installation process"); - InstallCallbackInterface WaitQuery = new InstallCallbackInterface() { - private LoaderCallbackInterface mUserAppCallback = Callback; - public String getPackageName() - { - return "OpenCV Manager"; - } - public void install() - { - Log.e(TAG, "Nothing to install we just wait current installation"); - } - public void cancel() - { - Log.d(TAG, "Waiting for OpenCV canceled by user"); - mServiceInstallationProgress = false; - int Status = LoaderCallbackInterface.INSTALL_CANCELED; - Log.d(TAG, "Init finished with status " + Status); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(Status); - } - public void wait_install() - { - InstallServiceQuiet(AppContext); - } - }; - - Callback.onPackageInstall(InstallCallbackInterface.INSTALLATION_PROGRESS, WaitQuery); - } - } - - /** - * URL of OpenCV Manager page on Google Play Market. - */ - protected static final String OPEN_CV_SERVICE_URL = "market://details?id=org.opencv.engine"; - - protected ServiceConnection mServiceConnection = new ServiceConnection() - { - public void onServiceConnected(ComponentName className, IBinder service) - { - Log.d(TAG, "Service connection created"); - mEngineService = OpenCVEngineInterface.Stub.asInterface(service); - if (null == mEngineService) - { - Log.d(TAG, "OpenCV Manager Service connection fails. May be service was not installed?"); - InstallService(mAppContext, mUserAppCallback); - } - else - { - mServiceInstallationProgress = false; - try - { - if (mEngineService.getEngineVersion() < MINIMUM_ENGINE_VERSION) - { - Log.d(TAG, "Init finished with status " + LoaderCallbackInterface.INCOMPATIBLE_MANAGER_VERSION); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(LoaderCallbackInterface.INCOMPATIBLE_MANAGER_VERSION); - return; - } - - Log.d(TAG, "Trying to get library path"); - String path = mEngineService.getLibPathByVersion(mOpenCVersion); - if ((null == path) || (path.length() == 0)) - { - if (!mLibraryInstallationProgress) - { - InstallCallbackInterface InstallQuery = new InstallCallbackInterface() { - public String getPackageName() - { - return "OpenCV library"; - } - public void install() { - Log.d(TAG, "Trying to install OpenCV lib via Google Play"); - try - { - if (mEngineService.installVersion(mOpenCVersion)) - { - mLibraryInstallationProgress = true; - Log.d(TAG, "Package installation started"); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - } - else - { - Log.d(TAG, "OpenCV package was not installed!"); - Log.d(TAG, "Init finished with status " + LoaderCallbackInterface.MARKET_ERROR); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(LoaderCallbackInterface.MARKET_ERROR); - } - } catch (RemoteException e) { - e.printStackTrace();; - Log.d(TAG, "Init finished with status " + LoaderCallbackInterface.INIT_FAILED); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(LoaderCallbackInterface.INIT_FAILED); - } - } - public void cancel() { - Log.d(TAG, "OpenCV library installation was canceled"); - Log.d(TAG, "Init finished with status " + LoaderCallbackInterface.INSTALL_CANCELED); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(LoaderCallbackInterface.INSTALL_CANCELED); - } - public void wait_install() { - Log.e(TAG, "Installation was not started! Nothing to wait!"); - } - }; - - mUserAppCallback.onPackageInstall(InstallCallbackInterface.NEW_INSTALLATION, InstallQuery); - } - else - { - InstallCallbackInterface WaitQuery = new InstallCallbackInterface() { - public String getPackageName() - { - return "OpenCV library"; - } - - public void install() { - Log.e(TAG, "Nothing to install we just wait current installation"); - } - public void cancel() - { - Log.d(TAG, "OpenCV library installation was canceled"); - mLibraryInstallationProgress = false; - Log.d(TAG, "Init finished with status " + LoaderCallbackInterface.INSTALL_CANCELED); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(LoaderCallbackInterface.INSTALL_CANCELED); - } - public void wait_install() { - Log.d(TAG, "Waiting for current installation"); - try - { - if (!mEngineService.installVersion(mOpenCVersion)) - { - Log.d(TAG, "OpenCV package was not installed!"); - Log.d(TAG, "Init finished with status " + LoaderCallbackInterface.MARKET_ERROR); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(LoaderCallbackInterface.MARKET_ERROR); - } - else - { - Log.d(TAG, "Waiting for package installation"); - } - - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - - } catch (RemoteException e) { - e.printStackTrace(); - Log.d(TAG, "Init finished with status " + LoaderCallbackInterface.INIT_FAILED); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(LoaderCallbackInterface.INIT_FAILED); - } - } - }; - - mUserAppCallback.onPackageInstall(InstallCallbackInterface.INSTALLATION_PROGRESS, WaitQuery); - } - return; - } - else - { - Log.d(TAG, "Trying to get library list"); - mLibraryInstallationProgress = false; - String libs = mEngineService.getLibraryList(mOpenCVersion); - Log.d(TAG, "Library list: \"" + libs + "\""); - Log.d(TAG, "First attempt to load libs"); - int status; - if (initOpenCVLibs(path, libs)) - { - Log.d(TAG, "First attempt to load libs is OK"); - String eol = System.getProperty("line.separator"); - for (String str : Core.getBuildInformation().split(eol)) - Log.i(TAG, str); - - status = LoaderCallbackInterface.SUCCESS; - } - else - { - Log.d(TAG, "First attempt to load libs fails"); - status = LoaderCallbackInterface.INIT_FAILED; - } - - Log.d(TAG, "Init finished with status " + status); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(status); - } - } - catch (RemoteException e) - { - e.printStackTrace(); - Log.d(TAG, "Init finished with status " + LoaderCallbackInterface.INIT_FAILED); - Log.d(TAG, "Unbind from service"); - mAppContext.unbindService(mServiceConnection); - Log.d(TAG, "Calling using callback"); - mUserAppCallback.onManagerConnected(LoaderCallbackInterface.INIT_FAILED); - } - } - } - - public void onServiceDisconnected(ComponentName className) - { - mEngineService = null; - } - }; - - private boolean loadLibrary(String AbsPath) - { - boolean result = true; - - Log.d(TAG, "Trying to load library " + AbsPath); - try - { - System.load(AbsPath); - Log.d(TAG, "OpenCV libs init was ok!"); - } - catch(UnsatisfiedLinkError e) - { - Log.d(TAG, "Cannot load library \"" + AbsPath + "\""); - e.printStackTrace(); - result = false; - } - - return result; - } - - private boolean initOpenCVLibs(String Path, String Libs) - { - Log.d(TAG, "Trying to init OpenCV libs"); - if ((null != Path) && (Path.length() != 0)) - { - boolean result = true; - if ((null != Libs) && (Libs.length() != 0)) - { - Log.d(TAG, "Trying to load libs by dependency list"); - StringTokenizer splitter = new StringTokenizer(Libs, ";"); - while(splitter.hasMoreTokens()) - { - String AbsLibraryPath = Path + File.separator + splitter.nextToken(); - result &= loadLibrary(AbsLibraryPath); - } - } - else - { - // If the dependencies list is not defined or empty. - String AbsLibraryPath = Path + File.separator + "libopencv_java4.so"; - result = loadLibrary(AbsLibraryPath); - } - - return result; - } - else - { - Log.d(TAG, "Library path \"" + Path + "\" is empty"); - return false; - } - } -} diff --git a/modules/java/generator/android/java/org/opencv/android/BaseLoaderCallback.java b/modules/java/generator/android/java/org/opencv/android/BaseLoaderCallback.java deleted file mode 100644 index 8ece662514..0000000000 --- a/modules/java/generator/android/java/org/opencv/android/BaseLoaderCallback.java +++ /dev/null @@ -1,141 +0,0 @@ -package org.opencv.android; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; -import android.util.Log; - -/** - * Basic implementation of LoaderCallbackInterface. - */ -public abstract class BaseLoaderCallback implements LoaderCallbackInterface { - - public BaseLoaderCallback(Context AppContext) { - mAppContext = AppContext; - } - - public void onManagerConnected(int status) - { - switch (status) - { - /** OpenCV initialization was successful. **/ - case LoaderCallbackInterface.SUCCESS: - { - /** Application must override this method to handle successful library initialization. **/ - } break; - /** OpenCV loader can not start Google Play Market. **/ - case LoaderCallbackInterface.MARKET_ERROR: - { - Log.e(TAG, "Package installation failed!"); - AlertDialog MarketErrorMessage = new AlertDialog.Builder(mAppContext).create(); - MarketErrorMessage.setTitle("OpenCV Manager"); - MarketErrorMessage.setMessage("Package installation failed!"); - MarketErrorMessage.setCancelable(false); // This blocks the 'BACK' button - MarketErrorMessage.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - finish(); - } - }); - MarketErrorMessage.show(); - } break; - /** Package installation has been canceled. **/ - case LoaderCallbackInterface.INSTALL_CANCELED: - { - Log.d(TAG, "OpenCV library installation was canceled by user"); - finish(); - } break; - /** Application is incompatible with this version of OpenCV Manager. Possibly, a service update is required. **/ - case LoaderCallbackInterface.INCOMPATIBLE_MANAGER_VERSION: - { - Log.d(TAG, "OpenCV Manager Service is uncompatible with this app!"); - AlertDialog IncomatibilityMessage = new AlertDialog.Builder(mAppContext).create(); - IncomatibilityMessage.setTitle("OpenCV Manager"); - IncomatibilityMessage.setMessage("OpenCV Manager service is incompatible with this app. Try to update it via Google Play."); - IncomatibilityMessage.setCancelable(false); // This blocks the 'BACK' button - IncomatibilityMessage.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - finish(); - } - }); - IncomatibilityMessage.show(); - } break; - /** Other status, i.e. INIT_FAILED. **/ - default: - { - Log.e(TAG, "OpenCV loading failed!"); - AlertDialog InitFailedDialog = new AlertDialog.Builder(mAppContext).create(); - InitFailedDialog.setTitle("OpenCV error"); - InitFailedDialog.setMessage("OpenCV was not initialised correctly. Application will be shut down"); - InitFailedDialog.setCancelable(false); // This blocks the 'BACK' button - InitFailedDialog.setButton(AlertDialog.BUTTON_POSITIVE, "OK", new OnClickListener() { - - public void onClick(DialogInterface dialog, int which) { - finish(); - } - }); - - InitFailedDialog.show(); - } break; - } - } - - public void onPackageInstall(final int operation, final InstallCallbackInterface callback) - { - switch (operation) - { - case InstallCallbackInterface.NEW_INSTALLATION: - { - AlertDialog InstallMessage = new AlertDialog.Builder(mAppContext).create(); - InstallMessage.setTitle("Package not found"); - InstallMessage.setMessage(callback.getPackageName() + " package was not found! Try to install it?"); - InstallMessage.setCancelable(false); // This blocks the 'BACK' button - InstallMessage.setButton(AlertDialog.BUTTON_POSITIVE, "Yes", new OnClickListener() - { - public void onClick(DialogInterface dialog, int which) - { - callback.install(); - } - }); - - InstallMessage.setButton(AlertDialog.BUTTON_NEGATIVE, "No", new OnClickListener() { - - public void onClick(DialogInterface dialog, int which) - { - callback.cancel(); - } - }); - - InstallMessage.show(); - } break; - case InstallCallbackInterface.INSTALLATION_PROGRESS: - { - AlertDialog WaitMessage = new AlertDialog.Builder(mAppContext).create(); - WaitMessage.setTitle("OpenCV is not ready"); - WaitMessage.setMessage("Installation is in progress. Wait or exit?"); - WaitMessage.setCancelable(false); // This blocks the 'BACK' button - WaitMessage.setButton(AlertDialog.BUTTON_POSITIVE, "Wait", new OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - callback.wait_install(); - } - }); - WaitMessage.setButton(AlertDialog.BUTTON_NEGATIVE, "Exit", new OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - callback.cancel(); - } - }); - - WaitMessage.show(); - } break; - } - } - - void finish() - { - ((Activity) mAppContext).finish(); - } - - protected Context mAppContext; - private final static String TAG = "OCV/BaseLoaderCallback"; -} diff --git a/modules/java/generator/android/java/org/opencv/android/InstallCallbackInterface.java b/modules/java/generator/android/java/org/opencv/android/InstallCallbackInterface.java deleted file mode 100644 index f68027a7ba..0000000000 --- a/modules/java/generator/android/java/org/opencv/android/InstallCallbackInterface.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.opencv.android; - -/** - * Installation callback interface. - */ -public interface InstallCallbackInterface -{ - /** - * New package installation is required. - */ - static final int NEW_INSTALLATION = 0; - /** - * Current package installation is in progress. - */ - static final int INSTALLATION_PROGRESS = 1; - - /** - * Target package name. - * @return Return target package name. - */ - public String getPackageName(); - /** - * Installation is approved. - */ - public void install(); - /** - * Installation is canceled. - */ - public void cancel(); - /** - * Wait for package installation. - */ - public void wait_install(); -}; diff --git a/modules/java/generator/android/java/org/opencv/android/LoaderCallbackInterface.java b/modules/java/generator/android/java/org/opencv/android/LoaderCallbackInterface.java deleted file mode 100644 index a941e8377b..0000000000 --- a/modules/java/generator/android/java/org/opencv/android/LoaderCallbackInterface.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.opencv.android; - -/** - * Interface for callback object in case of asynchronous initialization of OpenCV. - */ -public interface LoaderCallbackInterface -{ - /** - * OpenCV initialization finished successfully. - */ - static final int SUCCESS = 0; - /** - * Google Play Market cannot be invoked. - */ - static final int MARKET_ERROR = 2; - /** - * OpenCV library installation has been canceled by the user. - */ - static final int INSTALL_CANCELED = 3; - /** - * This version of OpenCV Manager Service is incompatible with the app. Possibly, a service update is required. - */ - static final int INCOMPATIBLE_MANAGER_VERSION = 4; - /** - * OpenCV library initialization has failed. - */ - static final int INIT_FAILED = 0xff; - - /** - * Callback method, called after OpenCV library initialization. - * @param status status of initialization (see initialization status constants). - */ - public void onManagerConnected(int status); - - /** - * Callback method, called in case the package installation is needed. - * @param callback answer object with approve and cancel methods and the package description. - */ - public void onPackageInstall(final int operation, InstallCallbackInterface callback); -}; diff --git a/modules/java/generator/android/java/org/opencv/android/OpenCVLoader.java.in b/modules/java/generator/android/java/org/opencv/android/OpenCVLoader.java.in index 625c3daf27..91cc534e84 100644 --- a/modules/java/generator/android/java/org/opencv/android/OpenCVLoader.java.in +++ b/modules/java/generator/android/java/org/opencv/android/OpenCVLoader.java.in @@ -7,102 +7,26 @@ import android.content.Context; */ public class OpenCVLoader { - /** - * OpenCV Library version 2.4.2. - */ - public static final String OPENCV_VERSION_2_4_2 = "2.4.2"; - - /** - * OpenCV Library version 2.4.3. - */ - public static final String OPENCV_VERSION_2_4_3 = "2.4.3"; - - /** - * OpenCV Library version 2.4.4. - */ - public static final String OPENCV_VERSION_2_4_4 = "2.4.4"; - - /** - * OpenCV Library version 2.4.5. - */ - public static final String OPENCV_VERSION_2_4_5 = "2.4.5"; - - /** - * OpenCV Library version 2.4.6. - */ - public static final String OPENCV_VERSION_2_4_6 = "2.4.6"; - - /** - * OpenCV Library version 2.4.7. - */ - public static final String OPENCV_VERSION_2_4_7 = "2.4.7"; - - /** - * OpenCV Library version 2.4.8. - */ - public static final String OPENCV_VERSION_2_4_8 = "2.4.8"; - - /** - * OpenCV Library version 2.4.9. - */ - public static final String OPENCV_VERSION_2_4_9 = "2.4.9"; - - /** - * OpenCV Library version 2.4.10. - */ - public static final String OPENCV_VERSION_2_4_10 = "2.4.10"; - - /** - * OpenCV Library version 2.4.11. - */ - public static final String OPENCV_VERSION_2_4_11 = "2.4.11"; - - /** - * OpenCV Library version 2.4.12. - */ - public static final String OPENCV_VERSION_2_4_12 = "2.4.12"; - - /** - * OpenCV Library version 2.4.13. - */ - public static final String OPENCV_VERSION_2_4_13 = "2.4.13"; - - /** - * OpenCV Library version 3.0.0. - */ - public static final String OPENCV_VERSION_3_0_0 = "3.0.0"; - - /** - * OpenCV Library version 3.1.0. - */ - public static final String OPENCV_VERSION_3_1_0 = "3.1.0"; - - /** - * OpenCV Library version 3.2.0. - */ - public static final String OPENCV_VERSION_3_2_0 = "3.2.0"; - - /** - * OpenCV Library version 3.3.0. - */ - public static final String OPENCV_VERSION_3_3_0 = "3.3.0"; - - /** - * OpenCV Library version 3.4.0. - */ - public static final String OPENCV_VERSION_3_4_0 = "3.4.0"; - /** * Current OpenCV Library version */ public static final String OPENCV_VERSION = "@OPENCV_VERSION_MAJOR@.@OPENCV_VERSION_MINOR@.@OPENCV_VERSION_PATCH@"; + /** + * Synonym for initLocal. Deprecated. + */ + @Deprecated + public static boolean initDebug() + { + return StaticHelper.initOpenCV(false); + } + /** * Loads and initializes OpenCV library from current application package. Roughly, it's an analog of system.loadLibrary("opencv_java"). * @return Returns true is initialization of OpenCV was successful. */ - public static boolean initDebug() + public static boolean initLocal() { return StaticHelper.initOpenCV(false); } @@ -112,21 +36,9 @@ public class OpenCVLoader * @param InitCuda load and initialize CUDA runtime libraries. * @return Returns true is initialization of OpenCV was successful. */ + @Deprecated public static boolean initDebug(boolean InitCuda) { return StaticHelper.initOpenCV(InitCuda); } - - /** - * Loads and initializes OpenCV library using OpenCV Engine service. - * @param Version OpenCV library version. - * @param AppContext application context for connecting to the service. - * @param Callback object, that implements LoaderCallbackInterface for handling the connection status. - * @return Returns true if initialization of OpenCV is successful. - */ - public static boolean initAsync(String Version, Context AppContext, - LoaderCallbackInterface Callback) - { - return AsyncServiceHelper.initOpenCV(Version, AppContext, Callback); - } } diff --git a/modules/java/generator/android/java/org/opencv/engine/OpenCVEngineInterface.aidl b/modules/java/generator/android/java/org/opencv/engine/OpenCVEngineInterface.aidl deleted file mode 100644 index 21fe5f716b..0000000000 --- a/modules/java/generator/android/java/org/opencv/engine/OpenCVEngineInterface.aidl +++ /dev/null @@ -1,33 +0,0 @@ -package org.opencv.engine; - -/** -* Class provides a Java interface for OpenCV Engine Service. It's synchronous with native OpenCVEngine class. -*/ -interface OpenCVEngineInterface -{ - /** - * @return Returns service version. - */ - int getEngineVersion(); - - /** - * Finds an installed OpenCV library. - * @param OpenCV version. - * @return Returns path to OpenCV native libs or an empty string if OpenCV can not be found. - */ - String getLibPathByVersion(String version); - - /** - * Tries to install defined version of OpenCV from Google Play Market. - * @param OpenCV version. - * @return Returns true if installation was successful or OpenCV package has been already installed. - */ - boolean installVersion(String version); - - /** - * Returns list of libraries in loading order, separated by semicolon. - * @param OpenCV version. - * @return Returns names of OpenCV libraries, separated by semicolon. - */ - String getLibraryList(String version); -} diff --git a/platforms/android/service/CMakeLists.txt b/platforms/android/service/CMakeLists.txt deleted file mode 100644 index 66e0c468a9..0000000000 --- a/platforms/android/service/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -if(NOT ANDROID_PROJECTS_BUILD_TYPE STREQUAL "ANT") - message(STATUS "Android OpenCV Manager is ignored") - return() -endif() - -if(BUILD_ANDROID_SERVICE) - add_subdirectory(engine) -endif() - -install(FILES "readme.txt" DESTINATION "apk/" COMPONENT libs) diff --git a/platforms/android/service/engine/AndroidManifest.xml b/platforms/android/service/engine/AndroidManifest.xml deleted file mode 100644 index 660152ed29..0000000000 --- a/platforms/android/service/engine/AndroidManifest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/platforms/android/service/engine/CMakeLists.txt b/platforms/android/service/engine/CMakeLists.txt deleted file mode 100644 index a31790a903..0000000000 --- a/platforms/android/service/engine/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/platforms/android/service/engine/.build/${ANDROID_MANIFEST_FILE}" @ONLY) -unset(__android_project_chain CACHE) -add_android_project(opencv_engine "${CMAKE_CURRENT_SOURCE_DIR}" SDK_TARGET 9 ${ANDROID_SDK_TARGET} IGNORE_JAVA ON IGNORE_MANIFEST ON COPY_LIBS ON) diff --git a/platforms/android/service/engine/res/drawable/icon.png b/platforms/android/service/engine/res/drawable/icon.png deleted file mode 100644 index 630454927b592eb585c21527c430fc739c7970a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1997 zcmV;;2Qv7HP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2iyk& z2s4Z(uWcvB1k+?B|HcZ5+p(*;Q^&-8AtzSnVCK7?)^Xiwf0*7z0ZN;t#z9i`sgtpqdV3hDNF*c2bKc!qcQaX zUny)Tz}^_l!dPca%!U9i64N>!i~1_h=?F58~*Mqs?aUag-wNp3eJ zaArHlobMV1PMO^yg*noOAUz|E0i{}8`nIiHOW|~F4mjoR_GH_vZVKN?bHNdXe;To> zxdyn_TnD>62p5lGlR~e9qrf7C+ui6sX@;J1@Mx>Yo=qMBRs~*)bDAoXUZYSHTab?f z_PACCXF@bcF}lW`X>mi~9D%@SGZ2{F%CTpbhLf>?v)%*vE3D~)z{*wz=t^t3pfEGA zffL(4AU5DX%yUkKoB_Jb(8oFW!NI-`j{z#&Z&^_sT-34vIXFYp`=GEPgYAu)4n9D4 z%K`*+8v7m2z|O!Kz|Xto?PB|!;VL`0G=ur`jDlQ$D=+i6dSt)j#Si?i#3rh3ZDkkx z+9TWVDcFEP;8fsZmts4LZyQ^=NS&&oMq^DBPd9*r!p~~YrdwMdQuxcK)CgcvlC7iQ z6m}XDL=_ke!d;S<2IvOy5aI>4B-sk!6i-qAqn6i#qR%}BH;aqaE~#zv6|u2ViZHn? z1hW8E8rkz`nyn$2WU0dhK4^p<)W{{jH|2^S^#FZ&jV&V)7;HC58VOgls*{S?bCuB! zgJG~P)&TrE+Oa9jPq^~G`MQI^ISDar1?}7f7D?&qi-Zc{Oivqep0%xlm22B7?$lt? zRDoZ$&ZSsjO2nE0ft%CR$aVrKp5WRX7^zue>Cw3+QGx=M@MFBYs{CEWmLZ zN*9hpz)s*B96QRjjj`Qi_;Vb>Z73h0DK9}$-axr}l%1BFSp9)x9Ky;`(^n%*$`F!V zkY*oPaAK+6&unXUeSit`5c;F3iU&9)kOVILi%-C3#za9jc>jUr;Wvs~#jZ#FaZ!2fi34Sb1N@BsFCj&@J zs;eb(o@Ffe=D?d6qPKGdXKQjn9~5j94Pu>ge`)`61V~3frX{l7>dTEi%6<8;N9K*(u}%^bWomltk*Vp@k|^lo)yA?qH}(jBlCHBo51XA|gNf(* zoeh<>k{r9Y4)pw$!k7FX&+PyB(?mq~(*^;K7{UQF&X#s!ILS zHX&7zhmyZ|_z=x$C7sRWW=r7+&daHU&gPWWQt)uC*X>tEFZ6J;H6WaAcCCQRo2VjP z>v8^kmJJ*U_eqdHY-p9+xixW&Umgf^mpLS>_nMj zvaJlD2pv8o7#@|SuT=D$XZ)5=GJyZFvEPhNoO#NE^Nc>q2{?8F#Z+({^MQk9zw9zH z=)VjA4HzfT(Fq(eDSwVGl!7_^3!$70OgHG7MYIxpx7Q{~Cgnag|7WoceAizs@IKwlGBBq*Ioi0qby4ylKkgqvR5BcLR&Vy39?8 - - - - - - - - - - - - -