diff --git a/README.md b/README.md index e59ba10..b157a57 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ - 本库依赖使用Gradle构建时添加一下即可 ```javascript -compile 'com.mylhyl:zxingscanner:2.1.0' +compile 'com.mylhyl:zxingscanner:2.1.1' ``` ## 2、离线jar,需要手动添加 Zxing 核心库 diff --git a/preview/lib/zxingscanner-2.1.0.jar b/preview/lib/zxingscanner-2.1.1.jar similarity index 88% rename from preview/lib/zxingscanner-2.1.0.jar rename to preview/lib/zxingscanner-2.1.1.jar index e26b553..92a6b11 100644 Binary files a/preview/lib/zxingscanner-2.1.0.jar and b/preview/lib/zxingscanner-2.1.1.jar differ diff --git a/preview/qrdown.png b/preview/qrdown.png index 64b79f9..9be6d92 100644 Binary files a/preview/qrdown.png and b/preview/qrdown.png differ diff --git a/sample/build.gradle b/sample/build.gradle index 27a2e37..903467b 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.mylhyl.zxing.scanner.sample" minSdkVersion 15 targetSdkVersion 23 - versionCode 3 - versionName "20171219" + versionCode 4 + versionName "20180412" } buildTypes { release { diff --git a/zxingscanner/build.gradle b/zxingscanner/build.gradle index 8d0d409..d6db27e 100644 --- a/zxingscanner/build.gradle +++ b/zxingscanner/build.gradle @@ -8,8 +8,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 23 - versionCode 20171229 - versionName '2.1.0' + versionCode 20180412 + versionName '2.1.1' } buildTypes { diff --git a/zxingscanner/src/main/java/com/mylhyl/zxing/scanner/encode/QREncode.java b/zxingscanner/src/main/java/com/mylhyl/zxing/scanner/encode/QREncode.java index 1425c4f..626889f 100644 --- a/zxingscanner/src/main/java/com/mylhyl/zxing/scanner/encode/QREncode.java +++ b/zxingscanner/src/main/java/com/mylhyl/zxing/scanner/encode/QREncode.java @@ -249,7 +249,7 @@ public Builder setLogoBitmap(Bitmap logoBitmap) { } /** - * 二维码中间的logo,logoSize不能 > Math.min(logoBitmap.getWidth(), logoBitmap.getHeight()) + * 二维码中间的logo,logoSize不能大于 Math.min(logoBitmap.getWidth(), logoBitmap.getHeight()) * * @param logoBitmap * @param logoSize