diff --git a/README.md b/README.md index d6b3b54..2fbf79e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![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=8fcc6a2f88552ea44b1411582c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad) +[![QQGroup](https://img.shields.io/badge/QQGroup-20867961-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=8fcc6a2f88552ea44b1.1.682c94fd124f7bb3ec227e2a400dbbfaad3dc2f5ad) ZXingLite for Android 是ZXing的精简版,基于ZXing库优化扫码和生成二维码/条形码功能,扫码界面完全支持自定义,也可一行代码使用默认实现的扫码功能。总之你想要的都在这里。 >简单如斯,你不试试? Come on~ @@ -54,21 +54,21 @@ ZXingLite for Android 是ZXing的精简版,基于ZXing库优化扫码和生成 com.king.zxing zxing-lite - 1.1.5 + 1.1.6 pom ``` ### Gradle: ```gradle //AndroidX 版本 -implementation 'com.king.zxing:zxing-lite:1.1.5-androidx' +implementation 'com.king.zxing:zxing-lite:1.1.6-androidx' //Android 版本 -implementation 'com.king.zxing:zxing-lite:1.1.5' +implementation 'com.king.zxing:zxing-lite:1.1.6' ``` ### Lvy: ```lvy - + ``` @@ -165,6 +165,10 @@ api 'com.google.zxing:core:3.3.3' ## 版本记录 +#### v1.1.6:2019-12-27 +* 生成条形码/二维码时支持自定义配置颜色 +* 支持识别反色码(增强识别率,默认不支持,需通过CaptureHelper.supportLuminanceInvert(true)开启) + #### v1.1.5:2019-12-16 * 优化Camera初始化相关策略,减少出现卡顿的可能性 @@ -182,7 +186,7 @@ api 'com.google.zxing:core:3.3.3' #### v1.1.1:2019-5-20 * 支持扫二维码过小时,自动缩放 -* 支持垂直条形码识别(增强条形码识别,默认不支持,需CaptureHelper.supportVerticalCode(true)开启) +* 支持识别垂直条形码(增强条形码识别,默认不支持,需通过CaptureHelper.supportVerticalCode(true)开启) #### v1.1.0:2019-4-19 * 将扫码相关逻辑与界面分离,ZXingLite使用更容易扩展 @@ -236,10 +240,11 @@ 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 254e74c..2b8d3b7 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 4230fcc..ecc8fe3 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":18,"versionName":"1.1.5-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":20,"versionName":"1.1.6-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/app/src/main/java/com/king/zxing/app/CustomActivity.java b/app/src/main/java/com/king/zxing/app/CustomActivity.java index 0c6a44b..1547be2 100644 --- a/app/src/main/java/com/king/zxing/app/CustomActivity.java +++ b/app/src/main/java/com/king/zxing/app/CustomActivity.java @@ -64,6 +64,7 @@ public class CustomActivity extends AppCompatActivity implements OnCaptureCallba mCaptureHelper.vibrate(true) .fullScreenScan(true)//全屏扫码 .supportVerticalCode(true)//支持扫垂直条码,建议有此需求时才使用。 + .supportLuminanceInvert(true)//是否支持识别反色码(黑白反色的码),增加识别率 .continuousScan(isContinuousScan); } @@ -115,4 +116,4 @@ public class CustomActivity extends AppCompatActivity implements OnCaptureCallba break; } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java b/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java index 6708866..bc4471a 100644 --- a/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java +++ b/app/src/main/java/com/king/zxing/app/CustomCaptureActivity.java @@ -59,7 +59,8 @@ public class CustomCaptureActivity extends CaptureActivity { .frontLightMode(FrontLightMode.AUTO)//设置闪光灯模式 .tooDarkLux(45f)//设置光线太暗时,自动触发开启闪光灯的照度值 .brightEnoughLux(100f)//设置光线足够明亮时,自动触发关闭闪光灯的照度值 - .continuousScan(isContinuousScan);//是否连扫 + .continuousScan(isContinuousScan)//是否连扫 + .supportLuminanceInvert(true);//是否支持识别反色码(黑白反色的码),增加识别率 } diff --git a/lib/src/main/java/com/king/zxing/CaptureActivity.java b/lib/src/main/java/com/king/zxing/CaptureActivity.java index e55eafe..65ec483 100644 --- a/lib/src/main/java/com/king/zxing/CaptureActivity.java +++ b/lib/src/main/java/com/king/zxing/CaptureActivity.java @@ -15,7 +15,6 @@ */ package com.king.zxing; -import android.app.Activity; import android.os.Bundle; import android.view.MotionEvent; import android.view.SurfaceView; diff --git a/versions.gradle b/versions.gradle index 9b140f7..a187442 100644 --- a/versions.gradle +++ b/versions.gradle @@ -1,7 +1,7 @@ //App def app_version = [:] -app_version.versionCode = 18 -app_version.versionName = "1.1.5-androidx" +app_version.versionCode = 20 +app_version.versionName = "1.1.6-androidx" ext.app_version = app_version //build version