This commit is contained in:
Jenly
2021-08-04 10:07:40 +08:00
parent 85a3cba5ce
commit 0fe3a2ef7e
8 changed files with 18 additions and 12 deletions

View File

@@ -74,7 +74,7 @@ allprojects {
```gradle ```gradle
//AndroidX 版本 //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.12021-8-4
* 更新CameraX至v1.0.1
* 优化CameraConfig的一些默认配置
#### v2.1.02021-6-30 (从v2.1.0开始不再发布至JCenter) #### v2.1.02021-6-30 (从v2.1.0开始不再发布至JCenter)
* 更新CameraX至v1.0.0 * 更新CameraX至v1.0.0
* 优化细节 * 优化细节

Binary file not shown.

View File

@@ -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":{}}] [{"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":{}}]

View File

@@ -14,8 +14,8 @@ org.gradle.jvmargs = -Xmx1536m
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
VERSION_NAME=2.1.0 VERSION_NAME=2.1.1
VERSION_CODE=31 VERSION_CODE=32
GROUP=com.github.jenly1314 GROUP=com.github.jenly1314
POM_DESCRIPTION=ZXingLite for Android POM_DESCRIPTION=ZXingLite for Android

View File

@@ -1,5 +1,9 @@
## 版本记录 ## 版本记录
#### v2.1.12021-8-4
* 更新CameraX至v1.0.1
* 优化CameraConfig的一些默认配置
#### v2.1.02021-6-30 (从v2.1.0开始不再发布至JCenter) #### v2.1.02021-6-30 (从v2.1.0开始不再发布至JCenter)
* 更新CameraX至v1.0.0 * 更新CameraX至v1.0.0
* 优化细节 * 优化细节

View File

@@ -1,7 +1,7 @@
//App //App
def app_version = [:] def app_version = [:]
app_version.versionCode = 31 app_version.versionCode = 32
app_version.versionName = "2.1.0" app_version.versionName = "2.1.1"
ext.app_version = app_version ext.app_version = app_version
//build version //build version
@@ -36,7 +36,7 @@ versions.coreKtx = "1.3.2"
//zxing //zxing
versions.zxing = "3.3.3" versions.zxing = "3.3.3"
versions.camerax = "1.0.0" versions.camerax = "1.0.1"
versions.easypermissions = "3.0.0" 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_core = "androidx.camera:camera-core:$versions.camerax"
deps.camera_camera2 = "androidx.camera:camera-camera2:$versions.camerax" deps.camera_camera2 = "androidx.camera:camera-camera2:$versions.camerax"
deps.camera_lifecycle = "androidx.camera:camera-lifecycle:$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 //permission

View File

@@ -13,7 +13,7 @@ import androidx.camera.core.ImageAnalysis;
import androidx.camera.core.Preview; import androidx.camera.core.Preview;
/** /**
* 相机配置:根据纵横比配置相机,使预览和输出的图像尽可能的接近屏幕比例 * 相机配置:根据纵横比配置相机,使输出分析的图像尽可能的接近屏幕比例
* @author <a href="mailto:jenly1314@gmail.com">Jenly</a> * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
*/ */
public final class AspectRatioCameraConfig extends CameraConfig { public final class AspectRatioCameraConfig extends CameraConfig {
@@ -43,7 +43,6 @@ public final class AspectRatioCameraConfig extends CameraConfig {
@NonNull @NonNull
@Override @Override
public Preview options(@NonNull Preview.Builder builder) { public Preview options(@NonNull Preview.Builder builder) {
builder.setTargetAspectRatio(mAspectRatio);
return super.options(builder); return super.options(builder);
} }

View File

@@ -13,7 +13,7 @@ import androidx.camera.core.ImageAnalysis;
import androidx.camera.core.Preview; import androidx.camera.core.Preview;
/** /**
* 相机配置:根据尺寸配置相机的目标图像,使预览和输出的图像尽可能的接近屏幕尺寸 * 相机配置:根据尺寸配置相机的目标图像,使输出分析的图像尽可能的接近屏幕尺寸
* @author <a href="mailto:jenly1314@gmail.com">Jenly</a> * @author <a href="mailto:jenly1314@gmail.com">Jenly</a>
*/ */
public class ResolutionCameraConfig extends CameraConfig { public class ResolutionCameraConfig extends CameraConfig {
@@ -54,7 +54,6 @@ public class ResolutionCameraConfig extends CameraConfig {
@NonNull @NonNull
@Override @Override
public Preview options(@NonNull Preview.Builder builder) { public Preview options(@NonNull Preview.Builder builder) {
builder.setTargetResolution(mTargetSize);
return super.options(builder); return super.options(builder);
} }