diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 2279136..3545368 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/README.md b/README.md index bee4564..674e6cc 100644 --- a/README.md +++ b/README.md @@ -36,17 +36,17 @@ ZXingLite for Android 是ZXing的精简版,优化扫码和生成二维码功 com.king.zxing zxing-lite - 1.0.0 + 1.0.1 pom ``` ### Gradle: ```gradle -implementation 'com.king.zxing:zxing-lite:1.0.0' +implementation 'com.king.zxing:zxing-lite:1.0.1' ``` ### Lvy: ```lvy - + ``` diff --git a/app/release/app-release.apk b/app/release/app-release.apk index f33d59b..724f40e 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 a7b1e07..bd004be 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9b14811..7fd3518 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.novoda:bintray-release:0.8.1' // NOTE: Do not place your application dependencies here; they belong diff --git a/lib/src/main/java/com/king/zxing/camera/CameraManager.java b/lib/src/main/java/com/king/zxing/camera/CameraManager.java index 90ac329..976b312 100644 --- a/lib/src/main/java/com/king/zxing/camera/CameraManager.java +++ b/lib/src/main/java/com/king/zxing/camera/CameraManager.java @@ -267,10 +267,10 @@ public synchronized Rect getFramingRectInPreview() { // Called early, before init even finished return null; } - rect.left = rect.left * cameraResolution.x / screenResolution.x; - rect.right = rect.right * cameraResolution.x / screenResolution.x; - rect.top = rect.top * cameraResolution.y / screenResolution.y; - rect.bottom = rect.bottom * cameraResolution.y / screenResolution.y; +// rect.left = rect.left * cameraResolution.x / screenResolution.x; +// rect.right = rect.right * cameraResolution.x / screenResolution.x; +// rect.top = rect.top * cameraResolution.y / screenResolution.y; +// rect.bottom = rect.bottom * cameraResolution.y / screenResolution.y; framingRectInPreview = rect; } return framingRectInPreview; @@ -329,8 +329,8 @@ public PlanarYUVLuminanceSource buildLuminanceSource(byte[] data, int width, int return null; } // Go ahead and assume it's YUV rather than die. - return new PlanarYUVLuminanceSource(data, width, height, rect.left, rect.top, - rect.width(), rect.height(), false); + return new PlanarYUVLuminanceSource(data, width, height, 0, 0, + width, height, false); } } \ No newline at end of file diff --git a/versions.gradle b/versions.gradle index 905c3fd..7c65fd7 100644 --- a/versions.gradle +++ b/versions.gradle @@ -1,7 +1,7 @@ //App def app_version = [:] -app_version.versionCode = 1 -app_version.versionName = "1.0.0" +app_version.versionCode = 2 +app_version.versionName = "1.0.1" ext.app_version = app_version //build version