diff --git a/README.md b/README.md index 85d9da4..af5da7c 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ allprojects { ```gradle //AndroidX 版本 -implementation 'com.github.jenly1314:zxing-lite:2.1.0' +implementation 'com.github.jenly1314:zxing-lite:2.1.1' ``` @@ -257,6 +257,10 @@ compileOptions { ## 版本记录 +#### v2.1.1:2021-8-4 +* 更新CameraX至v1.0.1 +* 优化CameraConfig的一些默认配置 + #### v2.1.0:2021-6-30 (从v2.1.0开始不再发布至JCenter) * 更新CameraX至v1.0.0 * 优化细节 diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 42ab15f..bcb5020 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 6585258..95cb442 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":31,"versionName":"2.1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":32,"versionName":"2.1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 0b0305b..99d787d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,8 +14,8 @@ org.gradle.jvmargs = -Xmx1536m android.useAndroidX=true android.enableJetifier=true -VERSION_NAME=2.1.0 -VERSION_CODE=31 +VERSION_NAME=2.1.1 +VERSION_CODE=32 GROUP=com.github.jenly1314 POM_DESCRIPTION=ZXingLite for Android diff --git a/update_log.md b/update_log.md index aa825f9..b9f2e7c 100644 --- a/update_log.md +++ b/update_log.md @@ -1,5 +1,9 @@ ## 版本记录 +#### v2.1.1:2021-8-4 +* 更新CameraX至v1.0.1 +* 优化CameraConfig的一些默认配置 + #### v2.1.0:2021-6-30 (从v2.1.0开始不再发布至JCenter) * 更新CameraX至v1.0.0 * 优化细节 diff --git a/versions.gradle b/versions.gradle index 13b7f93..9877115 100644 --- a/versions.gradle +++ b/versions.gradle @@ -1,7 +1,7 @@ //App def app_version = [:] -app_version.versionCode = 31 -app_version.versionName = "2.1.0" +app_version.versionCode = 32 +app_version.versionName = "2.1.1" ext.app_version = app_version //build version @@ -36,7 +36,7 @@ versions.coreKtx = "1.3.2" //zxing versions.zxing = "3.3.3" -versions.camerax = "1.0.0" +versions.camerax = "1.0.1" versions.easypermissions = "3.0.0" @@ -69,7 +69,7 @@ deps.zxing = "com.google.zxing:core:$versions.zxing" deps.camera_core = "androidx.camera:camera-core:$versions.camerax" deps.camera_camera2 = "androidx.camera:camera-camera2:$versions.camerax" deps.camera_lifecycle = "androidx.camera:camera-lifecycle:$versions.camerax" -deps.camera_view = "androidx.camera:camera-view:1.0.0-alpha25" +deps.camera_view = "androidx.camera:camera-view:1.0.0-alpha27" //permission diff --git a/zxing-lite/src/main/java/com/king/zxing/config/AspectRatioCameraConfig.java b/zxing-lite/src/main/java/com/king/zxing/config/AspectRatioCameraConfig.java index bdabd49..269716e 100644 --- a/zxing-lite/src/main/java/com/king/zxing/config/AspectRatioCameraConfig.java +++ b/zxing-lite/src/main/java/com/king/zxing/config/AspectRatioCameraConfig.java @@ -13,7 +13,7 @@ import androidx.camera.core.ImageAnalysis; import androidx.camera.core.Preview; /** - * 相机配置:根据纵横比配置相机,使预览和输出的图像尽可能的接近屏幕比例 + * 相机配置:根据纵横比配置相机,使输出分析的图像尽可能的接近屏幕比例 * @author Jenly */ public final class AspectRatioCameraConfig extends CameraConfig { @@ -43,7 +43,6 @@ public final class AspectRatioCameraConfig extends CameraConfig { @NonNull @Override public Preview options(@NonNull Preview.Builder builder) { - builder.setTargetAspectRatio(mAspectRatio); return super.options(builder); } diff --git a/zxing-lite/src/main/java/com/king/zxing/config/ResolutionCameraConfig.java b/zxing-lite/src/main/java/com/king/zxing/config/ResolutionCameraConfig.java index 097cdd8..b783641 100644 --- a/zxing-lite/src/main/java/com/king/zxing/config/ResolutionCameraConfig.java +++ b/zxing-lite/src/main/java/com/king/zxing/config/ResolutionCameraConfig.java @@ -13,7 +13,7 @@ import androidx.camera.core.ImageAnalysis; import androidx.camera.core.Preview; /** - * 相机配置:根据尺寸配置相机的目标图像,使预览和输出的图像尽可能的接近屏幕尺寸 + * 相机配置:根据尺寸配置相机的目标图像,使输出分析的图像尽可能的接近屏幕尺寸 * @author Jenly */ public class ResolutionCameraConfig extends CameraConfig { @@ -54,7 +54,6 @@ public class ResolutionCameraConfig extends CameraConfig { @NonNull @Override public Preview options(@NonNull Preview.Builder builder) { - builder.setTargetResolution(mTargetSize); return super.options(builder); }