upgrade opencv to 4

finengine/build.gradle

@@ -4,12 +4,13 @@ android {
     compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 18
+        minSdkVersion 21
         targetSdkVersion 23
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11 -frtti -fexceptions"
                 abiFilters 'armeabi-v7a'
+                arguments "-DANDROID_STL=c++_shared"
             }
         }
     }

finengine/src/main/CMakeLists.txt

@@ -7,14 +7,14 @@ add_library(lib_opencv SHARED IMPORTED)
 include_directories(${PROJECT_SOURCE_DIR}/../../src/main/cpp/include)
 set_target_properties(lib_opencv
                       PROPERTIES IMPORTED_LOCATION
-                      ${PROJECT_SOURCE_DIR}/../../libs/armeabi-v7a/libopencv_java3.so)
+                      ${PROJECT_SOURCE_DIR}/../../libs/armeabi-v7a/libopencv_java4.so)
 
 #加载人脸检测
-add_library(arc_soft_spotlight SHARED IMPORTED)
-include_directories(${PROJECT_SOURCE_DIR}/cpp/facedetect/arcsoft/inc/)
-set_target_properties(arc_soft_spotlight
-                      PROPERTIES IMPORTED_LOCATION
-                      ${PROJECT_SOURCE_DIR}/../../libs/armeabi-v7a/libArcSoftSpotlight.so)
+#add_library(arc_soft_spotlight SHARED IMPORTED)
+#include_directories(${PROJECT_SOURCE_DIR}/cpp/facedetect/arcsoft/inc/)
+#set_target_properties(arc_soft_spotlight
+#                      PROPERTIES IMPORTED_LOCATION
+#                      ${PROJECT_SOURCE_DIR}/../../libs/armeabi-v7a/libArcSoftSpotlight.so)
 
 
 #加载fin engine lib
@@ -33,20 +33,19 @@ add_library(fin-engine-lib
             ${PROJECT_SOURCE_DIR}/cpp/finrender/finrender.cpp
             ${PROJECT_SOURCE_DIR}/cpp/finrender/FinRenderHolder.cpp
             #===============face detect blew=============================
-            ${PROJECT_SOURCE_DIR}/cpp/facedetect/facedetector.cpp
-            ${PROJECT_SOURCE_DIR}/cpp/facedetect/arcsoft/arcsoft.cpp
+#            ${PROJECT_SOURCE_DIR}/cpp/facedetect/facedetector.cpp
+#            ${PROJECT_SOURCE_DIR}/cpp/facedetect/arcsoft/arcsoft.cpp
             #===============effects blew=================================
-            ${PROJECT_SOURCE_DIR}/cpp/effects/effects.cpp
-            ${PROJECT_SOURCE_DIR}/cpp/effects/faceswap/faceswap.cpp
-            ${PROJECT_SOURCE_DIR}/cpp/effects/faceswap/FaceSwapper.cpp
-            ${PROJECT_SOURCE_DIR}/cpp/effects/monalisa/monalisa.cpp
-            ${PROJECT_SOURCE_DIR}/cpp/effects/monalisa/MonaLisaEffect.cpp
+#            ${PROJECT_SOURCE_DIR}/cpp/effects/effects.cpp
+#            ${PROJECT_SOURCE_DIR}/cpp/effects/faceswap/faceswap.cpp
+#            ${PROJECT_SOURCE_DIR}/cpp/effects/faceswap/FaceSwapper.cpp
+#            ${PROJECT_SOURCE_DIR}/cpp/effects/monalisa/monalisa.cpp
+#            ${PROJECT_SOURCE_DIR}/cpp/effects/monalisa/MonaLisaEffect.cpp
             #===============openCv blew=================================
             ${PROJECT_SOURCE_DIR}/cpp/opencv/xcv.cpp
             )
 target_link_libraries(fin-engine-lib
                     lib_opencv
-                    arc_soft_spotlight
                     EGL
                     GLESv2
                     log

finengine/src/main/aidl/org/opencv/engine/OpenCVEngineInterface.aidl

@@ -0,0 +1,33 @@
+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);
+}