diff --git a/README.md b/README.md index 776f94d..3b655bc 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ ![Image](app/src/main/ic_launcher-web.png) [![Download](https://img.shields.io/badge/download-App-blue.svg)](https://raw.githubusercontent.com/jenly1314/ZXingLite/master/app/release/app-release.apk) -[![JCenter](https://img.shields.io/badge/JCenter-1.1.8-46C018.svg)](https://bintray.com/beta/#/jenly/maven/zxing-lite) +[![JCenter](https://img.shields.io/badge/JCenter-1.1.9-46C018.svg)](https://bintray.com/beta/#/jenly/maven/zxing-lite) [![JitPack](https://jitpack.io/v/jenly1314/ZXingLite.svg)](https://jitpack.io/#jenly1314/ZXingLite) [![CI](https://travis-ci.org/jenly1314/ZXingLite.svg?branch=master)](https://travis-ci.org/jenly1314/ZXingLite) [![CircleCI](https://circleci.com/gh/jenly1314/ZXingLite.svg?style=svg)](https://circleci.com/gh/jenly1314/ZXingLite) [![API](https://img.shields.io/badge/API-16%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=16) [![License](https://img.shields.io/badge/license-Apche%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![Blog](https://img.shields.io/badge/blog-Jenly-9933CC.svg)](https://jenly1314.github.io/) -[![QQGroup](https://img.shields.io/badge/QQGroup-20867961-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1.1.882c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad) +[![QQGroup](https://img.shields.io/badge/QQGroup-20867961-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1.1.982c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad) ZXingLite for Android 是ZXing的精简版,基于ZXing库优化扫码和生成二维码/条形码功能,扫码界面完全支持自定义,也可一行代码使用默认实现的扫码功能。总之你想要的都在这里。 >简单如斯,你不试试? Come on~ @@ -55,21 +55,21 @@ ZXingLite for Android 是ZXing的精简版,基于ZXing库优化扫码和生成 com.king.zxing zxing-lite - 1.1.8 + 1.1.9 pom ``` ### Gradle: ```gradle //AndroidX 版本 -implementation 'com.king.zxing:zxing-lite:1.1.8-androidx' +implementation 'com.king.zxing:zxing-lite:1.1.9-androidx' //Android 版本 -implementation 'com.king.zxing:zxing-lite:1.1.8' +implementation 'com.king.zxing:zxing-lite:1.1.9' ``` ### Lvy: ```lvy - + ``` @@ -170,13 +170,16 @@ api 'com.google.zxing:core:3.3.3' ## 版本记录 +#### v1.1.9:2020-4-28 +* 修复1.1.8版本优化细节时,不小心改出个Bug(fix #86) + #### v1.1.8:2020-4-27 * 统一日志管理 * 优化细节 #### v1.1.7:2020-3-29 * 优化一些默认参数配置 -* 修复扫码界面开启闪光灯并切到后台时,手电筒按钮状态未同步问题(fix#81) +* 修复扫码界面开启闪光灯并切到后台时,手电筒按钮状态未同步问题(fix #81) #### v1.1.6:2019-12-27 * 生成条形码/二维码时支持自定义配置颜色 @@ -186,8 +189,8 @@ api 'com.google.zxing:core:3.3.3' * 优化Camera初始化相关策略,减少出现卡顿的可能性 #### v1.1.4:2019-11-18 -* 内置手电筒按钮,当光线太暗时,自动显示手电筒 (fix#58) -* 生成二维码时Logo支持自定义大小 (fix#62) +* 内置手电筒按钮,当光线太暗时,自动显示手电筒 (fix #58) +* 生成二维码时Logo支持自定义大小 (fix #62) #### v1.1.3:2019-9-24 * 支持真实识别区域比例和识别区域偏移量可配置 @@ -253,7 +256,7 @@ api 'com.google.zxing:core:3.3.3' Github: jenly1314 - 加入QQ群: 20867961 + 加入QQ群: 20867961
diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 062ad4d..bb4b4e2 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 c6bf638..22cbfcc 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":24,"versionName":"1.1.8-androidx","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":26,"versionName":"1.1.9-androidx","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/lib/src/main/java/com/king/zxing/CaptureHelper.java b/lib/src/main/java/com/king/zxing/CaptureHelper.java index 2f23b5c..64fab14 100644 --- a/lib/src/main/java/com/king/zxing/CaptureHelper.java +++ b/lib/src/main/java/com/king/zxing/CaptureHelper.java @@ -22,7 +22,6 @@ import android.graphics.Bitmap; import android.graphics.Rect; import android.graphics.RectF; import android.hardware.Camera; -import android.util.Log; import android.view.MotionEvent; import android.view.SurfaceHolder; import android.view.SurfaceView; @@ -526,19 +525,18 @@ public class CaptureHelper implements CaptureLifecycle,CaptureTouchEvent,Capture return; } - if(isPlayBeep){//如果播放音效,则稍微延迟一点,给予播放音效时间 - if(captureHandler != null){ - captureHandler.postDelayed(() -> { - //如果设置了回调,并且onCallback返回为true,则表示拦截 - if(onCaptureCallback!=null && onCaptureCallback.onResultCallback(text)){ - return; - } - Intent intent = new Intent(); - intent.putExtra(Intents.Scan.RESULT,text); - activity.setResult(Activity.RESULT_OK,intent); - activity.finish(); - },100); - } + if(isPlayBeep && captureHandler != null){//如果播放音效,则稍微延迟一点,给予播放音效时间 + captureHandler.postDelayed(() -> { + //如果设置了回调,并且onCallback返回为true,则表示拦截 + if(onCaptureCallback!=null && onCaptureCallback.onResultCallback(text)){ + return; + } + Intent intent = new Intent(); + intent.putExtra(Intents.Scan.RESULT,text); + activity.setResult(Activity.RESULT_OK,intent); + activity.finish(); + },100); + return; } diff --git a/versions.gradle b/versions.gradle index 9fb4097..aeb7a12 100644 --- a/versions.gradle +++ b/versions.gradle @@ -1,7 +1,7 @@ //App def app_version = [:] -app_version.versionCode = 24 -app_version.versionName = "1.1.8-androidx" +app_version.versionCode = 26 +app_version.versionName = "1.1.9-androidx" ext.app_version = app_version //build version