1.扫描线效果不好，暂时去掉

2.调整primary color颜色值
wangmingdong102 · Jul 6, 2018 · 6f65efb · 6f65efb
1 parent 196025a
commit 6f65efb
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/bean/ZxingConfig.java b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/bean/ZxingConfig.java
@@ -38,6 +38,7 @@ public class ZxingConfig implements Serializable {
     @ColorRes
     private int frameLineColor = -1;
 
+
 //    /*扫描线颜色*/
 //    @ColorRes
 //    private int scanLineColor = R.color.scanLineColor;

diff --git a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/camera/CameraManager.java b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/camera/CameraManager.java
@@ -362,8 +362,6 @@ public PlanarYUVLuminanceSource buildLuminanceSource(byte[] data,
         } else {
             return new PlanarYUVLuminanceSource(data, width, height, rect.left,
                     rect.top, rect.width(), rect.height(), false);
-
-
         }
 
 

diff --git a/zxinglibrary/src/main/res/values/colors.xml b/zxinglibrary/src/main/res/values/colors.xml
@@ -8,7 +8,7 @@
     <color name="result_minor_text">#c0c0c0</color>
     <color name="result_points">#99cc00</color>
     <color name="result_text">#ffffffff</color>
-    <color name="result_view">#ff000000</color>
+    <color name="result_view">#000000</color>
     <color name="status_text">#ffffff</color>
     <color name="viewfinder_mask">#50000000</color>
     <color name="react">#63B8FF</color>

diff --git a/zxinglibrary/src/main/res/values/styles.xml b/zxinglibrary/src/main/res/values/styles.xml
@@ -2,8 +2,8 @@
 
     <!-- Base application theme. -->
     <style name="ZxingTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/result_view</item>
-        <item name="colorPrimaryDark">@color/result_view</item>
+        <item name="colorPrimary">#000000</item>
+        <item name="colorPrimaryDark">#000000</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowActionBarOverlay">true</item>
-Original file line number
+Diff line change
@@ Expand Up @@
             } else {
                 return new PlanarYUVLuminanceSource(data, width, height, rect.left,
                         rect.top, rect.width(), rect.height(), false);
             }
@@ Expand Down @@