0.9.4测试包

Author: devilsen

czxing/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 18
-        versionName "0.9.3"
+        versionCode 19
+        versionName "0.9.4-SNAPSHOT"
 
         externalNativeBuild {
             cmake {

czxing/src/main/cpp/CMakeLists.txt

@@ -15,23 +15,23 @@ include_directories(include)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}")
 
 # 静态方式导入库
-#add_library(opencv_core STATIC IMPORTED)
-#add_library(opencv_imgproc STATIC IMPORTED)
-#
-#add_library(cpufeatures STATIC IMPORTED)
-#add_library(tbb STATIC IMPORTED)
-#add_library(tegra_hal STATIC IMPORTED)
-#
+add_library(opencv_core STATIC IMPORTED)
+add_library(opencv_imgproc STATIC IMPORTED)
+
+add_library(cpufeatures STATIC IMPORTED)
+add_library(tbb STATIC IMPORTED)
+add_library(tegra_hal STATIC IMPORTED)
+
 ## 设置库路径
-#set_target_properties(opencv_core PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/libs/${ANDROID_ABI}/libopencv_core.a)
-#set_target_properties(opencv_imgproc PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/libs/${ANDROID_ABI}/libopencv_imgproc.a)
-#
-#set_target_properties(cpufeatures PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/3rdparty/libs/${ANDROID_ABI}/libcpufeatures.a)
-#set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/3rdparty/libs/${ANDROID_ABI}/libtbb.a)
-#set_target_properties(tegra_hal PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/3rdparty/libs/${ANDROID_ABI}/libtegra_hal.a)
+set_target_properties(opencv_core PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/libs/${ANDROID_ABI}/libopencv_core.a)
+set_target_properties(opencv_imgproc PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/libs/${ANDROID_ABI}/libopencv_imgproc.a)
+
+set_target_properties(cpufeatures PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/3rdparty/libs/${ANDROID_ABI}/libcpufeatures.a)
+set_target_properties(tbb PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/3rdparty/libs/${ANDROID_ABI}/libtbb.a)
+set_target_properties(tegra_hal PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../opencv/3rdparty/libs/${ANDROID_ABI}/libtegra_hal.a)
 
-add_library(opencv_java4 SHARED IMPORTED)
-set_target_properties(opencv_java4 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libopencv_java4.so)
+#add_library(opencv_java4 SHARED IMPORTED)
+#set_target_properties(opencv_java4 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libopencv_java4.so)
 
 # 导入zbar
 #add_library(iconv SHARED IMPORTED)
@@ -50,13 +50,13 @@ target_link_libraries(
 #        iconv
         zbar_croe
 
-#        opencv_imgproc
-#        opencv_core
-#        cpufeatures
-#        tbb
-#        tegra_hal
+        opencv_imgproc
+        opencv_core
+        cpufeatures
+        tbb
+        tegra_hal
 
-        opencv_java4
+#        opencv_java4
 
         jnigraphics
         android

czxing/src/main/cpp/JNIUtils.h

@@ -25,7 +25,7 @@
 #include "zbar/zbar.h"
 
 #define ZX_LOG_TAG "ZXing"
-#define DEBUG
+//#define DEBUG
 
 #define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, ZX_LOG_TAG, __VA_ARGS__)
 #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, ZX_LOG_TAG, __VA_ARGS__)