- 
- 
- 
- 您也可以扫描下面的二维码，请作者喝杯咖啡 :coffee: -
-
-
-
- 
+
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index b049ad6..fabd9cf 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
new file mode 100644
index 0000000..5b47a73
--- /dev/null
+++ b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+ "version": 3,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "com.king.zxing.app",
+ "variantName": "release",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "attributes": [],
+ "versionCode": 35,
+ "versionName": "2.3.0",
+ "outputFile": "app-release.apk"
+ }
+ ],
+ "elementType": "File"
+}
\ No newline at end of file
diff --git a/change_log.md b/change_log.md
index 922031f..08583d7 100644
--- a/change_log.md
+++ b/change_log.md
@@ -1,11 +1,16 @@
## 版本记录
+#### v2.3.0：2022-12-11
+* 更新CameraX至v1.2.0
+* 更新zxing至v3.5.1
+* 更新compileSdkVersion至33
+
#### v2.2.1：2022-6-22
* 更新CameraX至v1.1.0-rc02
#### v2.2.0：2022-5-31
* 更新CameraX至v1.1.0-rc01
-* 更新targetSdkVersion至31
+* 更新compileSdkVersion至31
* 更新Gradle至v7.2
#### v2.1.1：2021-8-4
diff --git a/gradle.properties b/gradle.properties
index 17d0a36..7abbfc5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,8 +14,8 @@ org.gradle.jvmargs = -Xmx1536m
android.useAndroidX=true
android.enableJetifier=true
-VERSION_NAME=2.2.1
-VERSION_CODE=34
+VERSION_NAME=2.3.0
+VERSION_CODE=35
GROUP=com.github.jenly1314
POM_DESCRIPTION=ZXingLite for Android
diff --git a/versions.gradle b/versions.gradle
index cf2ca12..7c06ec6 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -1,15 +1,15 @@
//App
def app_version = [:]
-app_version.versionCode = 34
-app_version.versionName = "2.2.1"
+app_version.versionCode = 35
+app_version.versionName = "2.3.0"
ext.app_version = app_version
//build version
def build_versions = [:]
build_versions.minSdk = 21
-build_versions.targetSdk = 31
-build_versions.compileSdk = 31
-build_versions.buildTools = "31.0.0"
+build_versions.targetSdk = 33
+build_versions.compileSdk = 33
+build_versions.buildTools = "33.0.0"
ext.build_versions = build_versions
ext.deps = [:]
@@ -34,9 +34,9 @@ versions.kotlin = "1.6.0"
versions.coreKtx = "1.6.0"
//zxing
-versions.zxing = "3.3.3"
+versions.zxing = "3.5.1"
-versions.camerax = "1.1.0-rc02"
+versions.camerax = "1.2.0"
versions.easypermissions = "3.0.0"
diff --git a/zxing-lite/src/main/java/com/king/zxing/DefaultCameraScan.java b/zxing-lite/src/main/java/com/king/zxing/DefaultCameraScan.java
index 4b53a1f..f0a75a2 100644
--- a/zxing-lite/src/main/java/com/king/zxing/DefaultCameraScan.java
+++ b/zxing-lite/src/main/java/com/king/zxing/DefaultCameraScan.java
@@ -200,9 +200,12 @@ public class DefaultCameraScan extends CameraScan {
private void startFocusAndMetering(float x, float y){
if(mCamera != null){
- LogUtils.d("startFocusAndMetering:" + x + "," + y);
MeteringPoint point = mPreviewView.getMeteringPointFactory().createPoint(x,y);
- mCamera.getCameraControl().startFocusAndMetering(new FocusMeteringAction.Builder(point).build());
+ FocusMeteringAction focusMeteringAction = new FocusMeteringAction.Builder(point).build();
+ if(mCamera.getCameraInfo().isFocusMeteringSupported(focusMeteringAction)){
+ mCamera.getCameraControl().startFocusAndMetering(focusMeteringAction);
+ LogUtils.d("startFocusAndMetering:" + x + "," + y);
+ }
}
}
@@ -489,6 +492,7 @@ public class DefaultCameraScan extends CameraScan {
return this;
}
+ @Override
public CameraScan setDarkLightLux(float lightLux){
if(mAmbientLightManager != null){
mAmbientLightManager.setDarkLightLux(lightLux);
@@ -496,6 +500,7 @@ public class DefaultCameraScan extends CameraScan {
return this;
}
+ @Override
public CameraScan setBrightLightLux(float lightLux){
if(mAmbientLightManager != null){
mAmbientLightManager.setBrightLightLux(lightLux);