v1.0.5 修复zxing生成中文二维码时出现乱码

Author: bingoogolapple

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0-alpha5'
+        classpath 'com.android.tools.build:gradle:2.1.0-beta1'
 
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -3,8 +3,8 @@ ANDROID_BUILD_TARGET_SDK_VERSION=23
 ANDROID_BUILD_SDK_VERSION=23
 ANDROID_BUILD_TOOLS_VERSION=23.0.3
 
-VERSION_NAME=1.0.4
-VERSION_CODE=104
+VERSION_NAME=1.0.5
+VERSION_CODE=105
 
 
 

zbardemo/build.gradle

@@ -18,7 +18,7 @@ dependencies {
 //    compile project(':zbar')
 
     // -------------------- 以下两个库是必须依赖的 ----------------------------
-    compile 'cn.bingoogolapple:bga-qrcodecore:1.0.4@aar'
-    compile 'cn.bingoogolapple:bga-zbar:1.0.4@aar'
+    compile 'cn.bingoogolapple:bga-qrcodecore:1.0.5@aar'
+    compile 'cn.bingoogolapple:bga-zbar:1.0.5@aar'
     // -------------------- 以上两个库是必须依赖的 ----------------------------
 }

zxing/build.gradle

@@ -16,4 +16,4 @@ dependencies {
 }
 
 // gradle uploadArchives
-//apply from: 'https://raw.githubusercontent.com/bingoogolapple/PublishAar/master/central-publish.gradle'
+apply from: 'https://raw.githubusercontent.com/bingoogolapple/PublishAar/master/central-publish.gradle'

zxing/src/main/java/cn/bingoogolapple/qrcode/zxing/QRCodeEncoder.java

@@ -5,15 +5,24 @@
 import android.os.AsyncTask;
 
 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.common.BitMatrix;
 
+import java.util.EnumMap;
+import java.util.Map;
+
 /**
  * 作者:王浩 邮件:[email protected]
  * 创建时间:16/4/8 下午11:22
  * 描述:创建二维码图片
  */
 public class QRCodeEncoder {
+    public static final Map<EncodeHintType, Object> HINTS = new EnumMap<EncodeHintType, Object>(EncodeHintType.class);
+
+    static {
+        HINTS.put(EncodeHintType.CHARACTER_SET, "utf-8");
+    }
 
     private QRCodeEncoder() {
     }
@@ -42,7 +51,7 @@ public static void encodeQRCode(final String content, final int size, final int
             @Override
             protected Bitmap doInBackground(Void... params) {
                 try {
-                    BitMatrix matrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, size, size);
+                    BitMatrix matrix = new MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, size, size, HINTS);
                     int[] pixels = new int[size * size];
                     for (int y = 0; y < size; y++) {
                         for (int x = 0; x < size; x++) {

zxingdemo/build.gradle

@@ -19,7 +19,7 @@ dependencies {
 
     // -------------------- 以下三个库是必须依赖的 ----------------------------
     compile 'com.google.zxing:core:3.2.1'
-    compile 'cn.bingoogolapple:bga-qrcodecore:1.0.4@aar'
-    compile 'cn.bingoogolapple:bga-zxing:1.0.4@aar'
+    compile 'cn.bingoogolapple:bga-qrcodecore:1.0.5@aar'
+    compile 'cn.bingoogolapple:bga-zxing:1.0.5@aar'
     // -------------------- 以上三个库是必须依赖的 ----------------------------
 }