修改Demo

maning0303 · Jun 19, 2020 · 86e2e52 · 86e2e52
1 parent 6d4823d
commit 86e2e52
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,23 +1,28 @@
-#   ZXingCode 快速集成二维码扫描
+#   ZXingCode 快速集成二维码扫描，支持AndroidX
 
 ##  快速集成二维码扫描，生成二维码，可配置相册，闪光灯，相机可以调整焦距放大缩小，自定义扫描线颜色，自定义背景颜色，自定义遮罩层（ZXing 3.4.0）
 [![](https://jitpack.io/v/maning0303/MNZXingCode.svg)](https://jitpack.io/#maning0303/MNZXingCode)
 
 ##  功能：
     1：生成二维码（带Logo）
-    2：二维码扫描
+    2：二维码扫描，手势缩放，无拉伸，样式所以选
     3：相册中选取图片识别
     4：闪光灯开关
     5: 相机可以调整焦距放大缩小
     6: 完全自定义遮罩层
 
 ## 截图:
-![image](https://github.com/maning0303/ZXingCodeDemo/blob/master/screenshots/mn_zxing_screenshot_000.png)
+![image](https://github.com/maning0303/ZXingCodeDemo/blob/master/screenshots/mn_zxing_screenshot_000.jpeg)
 ![image](https://github.com/maning0303/ZXingCodeDemo/blob/master/screenshots/mn_zxing_screenshot_001.jpeg)
-![image](https://github.com/maning0303/ZXingCodeDemo/blob/master/screenshots/mn_zxing_screenshot_002.png)
+
+#### 默认扫描
+![image](https://github.com/maning0303/ZXingCodeDemo/blob/master/screenshots/mn_zxing_screenshot_002.jpeg)
+
+#### 自定义颜色扫描样式等
+![image](https://github.com/maning0303/ZXingCodeDemo/blob/master/screenshots/mn_zxing_screenshot_003.jpeg)
 
 #### 完全自定义遮罩层
-![image](https://github.com/maning0303/ZXingCodeDemo/blob/master/screenshots/mn_zxing_screenshot_003.png)
+![image](https://github.com/maning0303/ZXingCodeDemo/blob/master/screenshots/mn_zxing_screenshot_004.jpeg)
 
 ## 如何添加
 ### Gradle添加：
@@ -198,6 +203,7 @@
 
 [zxing](https://github.com/zxing/zxing)
 [BGAQRCode-Android](https://github.com/bingoogolapple/BGAQRCode-Android)
+[Ye-Miao](https://github.com/Ye-Miao)
 感谢所有开源的人；
 
 

diff --git a/app/src/main/java/com/maning/zxingcodedemo/CustomScanActivity.java b/app/src/main/java/com/maning/zxingcodedemo/CustomScanActivity.java
@@ -236,6 +236,10 @@ public void onColorPicked(int color) {
     private String getHexString(int color) {
         String format = String.format("#%X", color);
         Log.e("=====", "format:" + format);
+        if("#0".equals(format)){
+            format = "#00000000";
+            Log.e("=====", "format:" + format);
+        }
         return format;
     }
 

diff --git a/screenshots/mn_zxing_screenshot_000.jpeg b/screenshots/mn_zxing_screenshot_000.jpeg
diff --git a/screenshots/mn_zxing_screenshot_000.png b/screenshots/mn_zxing_screenshot_000.png
diff --git a/screenshots/mn_zxing_screenshot_001.jpeg b/screenshots/mn_zxing_screenshot_001.jpeg
diff --git a/screenshots/mn_zxing_screenshot_002.jpeg b/screenshots/mn_zxing_screenshot_002.jpeg
diff --git a/screenshots/mn_zxing_screenshot_002.png b/screenshots/mn_zxing_screenshot_002.png
diff --git a/screenshots/mn_zxing_screenshot_003.jpeg b/screenshots/mn_zxing_screenshot_003.jpeg
diff --git a/screenshots/mn_zxing_screenshot_003.png b/screenshots/mn_zxing_screenshot_003.png
diff --git a/screenshots/mn_zxing_screenshot_004.jpeg b/screenshots/mn_zxing_screenshot_004.jpeg