From b359ca691de8937696f8abae7342fe800f6df5bb Mon Sep 17 00:00:00 2001 From: vin Date: Mon, 7 Jul 2025 14:05:08 +0800 Subject: [PATCH 1/2] add camera autoFocus when take picture --- maven.properties | 2 +- .../vin/android/scanner/core/Camera1View.java | 41 +++++++++++-------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/maven.properties b/maven.properties index 0eef157..53ed6e2 100644 --- a/maven.properties +++ b/maven.properties @@ -48,7 +48,7 @@ HUAWEI_ENGINE_POM_DESCRIPTION=Using Huawei decode barcode #scanner module pom info SCANNER_POM_NAME=scanner -SCANNER_POM_VERSION=1.0.26 +SCANNER_POM_VERSION=1.0.26.1 SCANNER_POM_ARTIFACTID=scanner SCANNER_POM_GROUPID=io.vin.android SCANNER_POM_PACKAGING=aar diff --git a/scanner/src/main/java/io/vin/android/scanner/core/Camera1View.java b/scanner/src/main/java/io/vin/android/scanner/core/Camera1View.java index 6a1ee89..10b583c 100644 --- a/scanner/src/main/java/io/vin/android/scanner/core/Camera1View.java +++ b/scanner/src/main/java/io/vin/android/scanner/core/Camera1View.java @@ -406,25 +406,30 @@ public void takePicture(Camera.ShutterCallback shutter, Camera.PictureCallback r if (available) { try { isTakingPictures = true; - mCamera.takePicture(shutter, raw, (byte[] data, Camera camera) -> { - try { - isTakingPictures = false; - Log.d(TAG, "takePicture回调"); - // 立刻取消自动对焦 - boolean tmpAutoFocus = mAutoFocus; - setAutoFocus(false); - // 业务层获取图片数据 - jpeg.onPictureTaken(data, camera); - - if (isCameraAvailable()){ - // 重新预览 - mCamera.startPreview(); - // 重新恢复自动对焦 - setAutoFocus(tmpAutoFocus); + boolean autoFocusBack = mAutoFocus; + mAutoFocus = false; // 取消自动对焦 + mCamera.autoFocus((boolean success, Camera camera1)->{ + mCamera.takePicture(shutter, raw, (byte[] data, Camera camera) -> { + try { + isTakingPictures = false; + Log.d(TAG, "takePicture回调"); + // 立刻取消自动对焦 + boolean tmpAutoFocus = mAutoFocus; + setAutoFocus(false); + // 业务层获取图片数据 + jpeg.onPictureTaken(data, camera); + + if (isCameraAvailable()){ + // 重新预览 + mCamera.startPreview(); + // 重新恢复自动对焦 + setAutoFocus(tmpAutoFocus); + } + } catch (Exception e) { + e.printStackTrace(); } - } catch (Exception e) { - e.printStackTrace(); - } + mAutoFocus = autoFocusBack; // 恢复自动对焦状态 + }); }); } catch (Exception ex) { Log.d(TAG, "takePicture异常：" + ex.getMessage()); From 468c68eec5a5325754a6dff52bbf48d7f971543c Mon Sep 17 00:00:00 2001 From: vin Date: Thu, 11 Dec 2025 10:36:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7gradle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e22bf0c..7754a9a 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04b3b37..8b56245 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip