加入arm64

wuxinlingluan · Jul 23, 2019 · d2bd792 · d2bd792
1 parent 36ab665
commit d2bd792
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 21 deletions.
diff --git a/czxing/build.gradle b/czxing/build.gradle
@@ -13,7 +13,7 @@ android {
 
         externalNativeBuild {
             cmake {
-                abiFilters "armeabi-v7a"
+                abiFilters "armeabi-v7a","arm64-v8a"
             }
         }
     }

diff --git a/czxing/libs/arm64-v8a/libopencv_java4.so b/czxing/libs/arm64-v8a/libopencv_java4.so
diff --git a/czxing/libs/x86/libopencv_java4.so b/czxing/libs/x86/libopencv_java4.so
diff --git a/czxing/src/main/cpp/native-lib.cpp b/czxing/src/main/cpp/native-lib.cpp
@@ -154,10 +154,10 @@ Java_me_devilsen_czxing_BarcodeReader_analysisBrightnessNative(JNIEnv *env, jcla
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_me_devilsen_czxing_BarcodeReader_writeBarcode(JNIEnv *env, jclass type, jstring content_,
-                                                   jint width, jint height, jobjectArray result) {
+Java_me_devilsen_czxing_BarcodeWriter_writeBarcode(JNIEnv *env, jclass type, jstring content_,
+                                                   jint width, jint height, jint color,
+                                                   jobjectArray result) {
     const char *content = env->GetStringUTFChars(content_, 0);
-
     try {
         std::wstring wContent;
         wContent = StringToWString(content);
@@ -171,7 +171,7 @@ Java_me_devilsen_czxing_BarcodeReader_writeBarcode(JNIEnv *env, jclass type, jst
 
         int size = width * height;
         jintArray pixels = env->NewIntArray(size);
-        int black = 0xff000000;
+        int black = color;
         int white = 0xffffffff;
         int index = 0;
         for (int i = 0; i < height; ++i) {

diff --git a/czxing/src/main/java/me/devilsen/czxing/BarcodeReader.java b/czxing/src/main/java/me/devilsen/czxing/BarcodeReader.java
@@ -101,15 +101,6 @@ public Result read(byte[] data, int cropLeft, int cropTop, int cropWidth, int cr
         return null;
     }
 
-    public Bitmap write(String text, int width, int height) {
-        Object[] result = new Object[1];
-        int resultCode = writeBarcode(text, width, height, result);
-        if (resultCode > -1) {
-            int[] pixels = (int[]) result[0];
-            return Bitmap.createBitmap(pixels, width, height, Bitmap.Config.ARGB_8888);
-        }
-        return null;
-    }
 
     public boolean analysisBrightness(byte[] data, int imageWidth, int imageHeight) {
         return analysisBrightnessNative(data, imageWidth, imageHeight);
@@ -140,8 +131,6 @@ protected void finalize() throws Throwable {
 
     public static native boolean analysisBrightnessNative(byte[] bytes, int width, int height);
 
-    public static native int writeBarcode(String content, int width, int height, Object[] result);
-
     static {
         System.loadLibrary("zxing-lib");
     }

diff --git a/czxing/src/main/java/me/devilsen/czxing/BarcodeWriter.java b/czxing/src/main/java/me/devilsen/czxing/BarcodeWriter.java
@@ -1,5 +1,8 @@
 package me.devilsen.czxing;
 
+import android.graphics.Bitmap;
+import android.graphics.Color;
+
 /**
  * desc : 生成二维码处理
  * date : 2019-07-22 15:35
@@ -8,6 +11,41 @@
  */
 public class BarcodeWriter {
 
+    /**
+     * 生成二维码
+     *
+     * @param text   要生成的文本
+     * @param width  bitmap 宽
+     * @param height bitmap 高
+     * @return bitmap二维码
+     */
+    public Bitmap write(String text, int width, int height) {
+        return write(text, width, height, Color.BLACK);
+    }
+
+    /**
+     * 生成二维码
+     *
+     * @param text   要生成的文本
+     * @param width  bitmap 宽
+     * @param height bitmap 高
+     * @param color  要生成的二维码颜色
+     * @return bitmap二维码
+     */
+    public Bitmap write(String text, int width, int height, int color) {
+        Object[] result = new Object[1];
+        int resultCode = writeBarcode(text, width, height, color, result);
+        if (resultCode > -1) {
+            int[] pixels = (int[]) result[0];
+            return Bitmap.createBitmap(pixels, width, height, Bitmap.Config.ARGB_8888);
+        }
+        return null;
+    }
+
+    public static native int writeBarcode(String content, int width, int height, int color, Object[] result);
 
+    static {
+        System.loadLibrary("zxing-lib");
+    }
 
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -15,13 +15,13 @@ android {
 
         externalNativeBuild {
             cmake {
-                abiFilters "armeabi-v7a"
+                abiFilters "armeabi-v7a","arm64-v8a"
             }
         }
 
         ndk {
             // 设置支持的SO库架构
-            abiFilters "armeabi-v7a"
+            abiFilters "armeabi-v7a","arm64-v8a"
         }
     }
 
@@ -41,8 +41,8 @@ android {
 
 dependencies {
 
-    implementation project(':czxing')
-//    implementation 'me.devilsen:CZXing:0.1'
+//    implementation project(':czxing')
+    implementation 'me.devilsen:CZXing:0.3'
 
     implementation rootProject.ext.appcompat
     testImplementation rootProject.ext.junit

diff --git a/sample/src/main/java/me/sam/czxing/WriteCodeActivity.java b/sample/src/main/java/me/sam/czxing/WriteCodeActivity.java
@@ -9,6 +9,7 @@
 
 import me.devilsen.czxing.BarcodeFormat;
 import me.devilsen.czxing.BarcodeReader;
+import me.devilsen.czxing.BarcodeWriter;
 import me.devilsen.czxing.util.BarCodeUtil;
 
 /**
@@ -26,7 +27,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         ImageView imageView = findViewById(R.id.image_view_qr_code);
 
-        BarcodeReader reader = new BarcodeReader(BarcodeFormat.QR_CODE);
+        BarcodeWriter reader = new BarcodeWriter();
         Bitmap bitmap = reader.write("Hello World", BarCodeUtil.dp2px(this, 200), BarCodeUtil.dp2px(this, 200));
 
         if (bitmap != null) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ android { @@
             externalNativeBuild {
                 cmake {
-                    abiFilters "armeabi-v7a"
+                    abiFilters "armeabi-v7a","arm64-v8a"
                 }
             }
         }
@@ Expand Down @@