release 2.1.1

mylhyl · mylhyl · commit bf7886b9c4f9 · 2018-04-12T19:32:41.000+08:00
diff --git 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.1.jar b/preview/lib/zxingscanner-2.1.1.jar
diff --git a/preview/qrdown.png b/preview/qrdown.png
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ public Builder setLogoBitmap(Bitmap logoBitmap) {`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`/**`
`252`		`- * 二维码中间的logo，logoSize不能 > Math.min(logoBitmap.getWidth(), logoBitmap.getHeight())`
	`252`	`+ * 二维码中间的logo，logoSize不能大于 Math.min(logoBitmap.getWidth(), logoBitmap.getHeight())`
`253`	`253`	`*`
`254`	`254`	`* @param logoBitmap`
`255`	`255`	`* @param logoSize`