发布0.9.7版本

Author: devilsen

README.md

@@ -9,7 +9,7 @@ C++ port of ZXing for Android
 ### 使用
 在gradle中:
 ``` groovy
-implementation 'me.devilsen:CZXing:0.9.6'
+implementation 'me.devilsen:CZXing:0.9.7'
 ```
 建议加入abiFilters
 ```gradle
@@ -37,6 +37,10 @@ Scanner.with(this)
         .setScanMode(ScanView.SCAN_MODE_TINY)                   // 扫描区域
         .setTitle("My Scan View")                               // 扫码界面标题
         .showAlbum(true)                                        // 显示相册(默认为true)
+        .setBarcodeFormat(BarcodeFormat.EAN_13)                 // 设置扫码格式
+        .setScanNoticeText("扫描二维码")                         // 设置扫码文字提示
+        .setFlashLightOnText("打开闪光灯")                       // 打开闪光灯提示
+        .setFlashLightOffText("关闭闪光灯")                      // 关闭闪光灯提示
         .continuousScan()                                       // 连续扫码，不关闭扫码界面
         .setOnClickAlbumDelegate(new ScanActivityDelegate.OnClickAlbumDelegate() {
             @Override

czxing/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 19
-        versionName "0.9.6"
+        versionCode 20
+        versionName "0.9.7"
 
         externalNativeBuild {
             cmake {

czxing/src/main/cpp/CMakeLists.txt

@@ -14,7 +14,7 @@ include_directories(zxing)
 include_directories(include)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}")
 
-#add_compile_options(czxing "-O1" "-fPIC")
+add_compile_options(czxing "-O1" "-fPIC")
 
 # 静态方式导入库
 add_library(opencv_core STATIC IMPORTED)
@@ -36,10 +36,10 @@ set_target_properties(tegra_hal PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}
 #set_target_properties(opencv_java4 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libopencv_java4.so)
 
 # 导入zbar
-#add_library(iconv SHARED IMPORTED)
-add_library(zbar_croe SHARED IMPORTED)
-#set_target_properties(iconv PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libiconv.so)
-set_target_properties(zbar_croe PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libzbarjni.so)
+add_library(iconv SHARED IMPORTED)
+add_library(zbar_core SHARED IMPORTED)
+set_target_properties(iconv PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libiconv.so)
+set_target_properties(zbar_core PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libzbarjni.so)
 
 find_library(
         log-lib
@@ -49,8 +49,8 @@ target_link_libraries(
         czxing
         ZXingCore
 
-#        iconv
-        zbar_croe
+        iconv
+        zbar_core
 
         opencv_imgproc
         opencv_core

czxing/src/main/java/me/devilsen/czxing/camera/CameraSurface.java

@@ -23,6 +23,7 @@
 public class CameraSurface extends SurfaceView implements SensorController.CameraFocusListener,
         SurfaceHolder.Callback {
 
+    private static final long ONE_SECOND = 1000;
     private Camera mCamera;
 
     private float mOldDist = 1f;
@@ -33,6 +34,7 @@ public class CameraSurface extends SurfaceView implements SensorController.Camer
     private boolean mZoomOutFlag;
 
     private Point focusCenter;
+    private long mLastFrozenTime;
     private long mLastTouchTime;
     private SensorController mSensorController;
     private CameraConfigurationManager mCameraConfigurationManager;
@@ -214,7 +216,13 @@ private void doubleTap() {
      */
     @Override
     public void onFrozen() {
-        BarCodeUtil.d("mCamera is frozen, start focus x = " + focusCenter.x + " y = "+ focusCenter.y);
+        long now = System.currentTimeMillis();
+        if (now - mLastFrozenTime < ONE_SECOND) {
+            return;
+        }
+        mLastFrozenTime = now;
+
+        BarCodeUtil.d("mCamera is frozen, start focus x = " + focusCenter.x + " y = " + focusCenter.y);
         handleFocus(focusCenter.x, focusCenter.y);
     }
 

sample/build.gradle

@@ -48,8 +48,8 @@ android {
 dependencies {
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-3'
-    implementation project(':czxing')
-//    implementation 'me.devilsen:CZXing:0.9.6'
+//    implementation project(':czxing')
+    implementation 'me.devilsen:CZXing:0.9.7'
 
     implementation rootProject.ext.appcompat
     testImplementation rootProject.ext.junit