update .gitignore

.gitignore

@@ -1,9 +1,185 @@
+
+# Created by https://www.gitignore.io/api/android,androidstudio
+
+### Android ###
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
 *.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+
+# Keystore files
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+### Android Patch ###
+gen-external-apklibs
+
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+
+# Built application files
+
+# Files for the ART/Dalvik VM
+
+# Java class files
+
+# Generated files
+
+# Gradle files
 .gradle
-/local.properties
-/.idea
+
+# Signing files
+.signing/
+
+# Local configuration file (sdk path, etc)
+
+# Proguard folder generated by Eclipse
+
+# Log Files
+
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+*.ipr
+*~
+*.swp
+
+# Android Patch
+
+# External native build folder generated in Android Studio 2.2 and later
+
+# NDK
+obj/
+
+# IntelliJ IDEA
+*.iws
+/out/
+
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# OS-specific files
 .DS_Store
-/build
-/captures
-.externalNativeBuild
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+hs_err_pid*
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+
 
+# End of https://www.gitignore.io/api/android,androidstudio

app/src/main/java/com/yzq/zxing/MainActivity.java

@@ -113,10 +113,10 @@ public void onAction(List<String> permissions) {
                                 ZxingConfig config = new ZxingConfig();
                                 config.setPlayBeep(true);//是否播放扫描声音 默认为true
                                 config.setShake(true);//是否震动  默认为true
-                                config.setDecodeBarCode(false);//是否扫描条形码 默认为true
+                                config.setDecodeBarCode(true);//是否扫描条形码 默认为true
                                 config.setReactColor(R.color.white);//设置扫描框四个角的颜色 默认为淡蓝色
                                 config.setFrameLineColor(R.color.white);//设置扫描框边框颜色 默认无色
-                                config.setFullScreenScan(false);//是否全屏扫描  默认为true  设为false则只会在扫描框中扫描
+                                config.setFullScreenScan(true);//是否全屏扫描  默认为true  设为false则只会在扫描框中扫描
                                 intent.putExtra(Constant.INTENT_ZXING_CONFIG, config);
                                 startActivityForResult(intent, REQUEST_CODE_SCAN);
                             }

build.gradle

@@ -31,7 +31,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Apr 03 09:37:53 CST 2018
+#Sat Sep 29 15:48:14 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java

@@ -103,7 +103,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (config == null) {
             config = new ZxingConfig();
         }
-        
+
 
         setContentView(R.layout.activity_capture);
 
@@ -221,7 +221,7 @@ private void switchVisibility(View view, boolean b) {
     protected void onResume() {
         super.onResume();
 
-        cameraManager = new CameraManager(getApplication(),config);
+        cameraManager = new CameraManager(getApplication(), config);
 
         viewfinderView.setCameraManager(cameraManager);
         handler = null;

zxinglibrary/src/main/java/com/yzq/zxinglibrary/decode/DecodeImgThread.java

@@ -15,13 +15,6 @@
 import java.util.Hashtable;
 import java.util.Vector;
 
-/**
- * Created by yzq on 2017/10/17.
- * <p>
- * 解析二维码图片
- * 解析是耗时操作，要放在子线程
- */
-
 public class DecodeImgThread extends Thread {
 
 

zxinglibrary/src/main/java/com/yzq/zxinglibrary/view/ViewfinderView.java

@@ -168,7 +168,7 @@ public void onDraw(Canvas canvas) {
             drawScanLight(canvas, frame);
 
             /*绘制闪动的点*/
-          //  drawPoint(canvas, frame, previewFrame);
+            //  drawPoint(canvas, frame, previewFrame);
         }
     }