From 5304bb3e801761a43e6bfbd894fecb1491947a89 Mon Sep 17 00:00:00 2001
From: yzq <1149635502@qq.com>
Date: Fri, 25 Aug 2017 17:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AA=E5=85=89=E7=81=AF=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=20=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F=E9=97=AA?=
 =?UTF-8?q?=E5=85=89=E7=81=AF=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/modules.xml                                               | 2 +-
 .../main/java/com/yzq/zxinglibrary/android/CaptureActivity.java | 2 ++
 zxinglibrary/src/main/res/layout/capture.xml                    | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3b27310..cc36546 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/Zxing.iml" filepath="$PROJECT_DIR$/Zxing.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/zxing.iml" filepath="$PROJECT_DIR$/zxing.iml" />
       <module fileurl="file://$PROJECT_DIR$/zxinglibrary/zxinglibrary.iml" filepath="$PROJECT_DIR$/zxinglibrary/zxinglibrary.iml" />
     </modules>
   </component>
diff --git a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java
index 6983bb7..94b02b4 100644
--- a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java
+++ b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java
@@ -24,6 +24,7 @@
 import com.google.zxing.Result;
 import com.yzq.zxinglibrary.Consants;
 import com.yzq.zxinglibrary.R;
+
 import com.yzq.zxinglibrary.camera.CameraManager;
 import com.yzq.zxinglibrary.view.ViewfinderView;
 
@@ -92,6 +93,7 @@ public void onCreate(Bundle icicle) {
         inactivityTimer = new InactivityTimer(this);
         beepManager = new BeepManager(this);
 
+
         imageButton_back = (ImageButton) findViewById(R.id.capture_imageview_back);
         flashLightIv = (ImageView) findViewById(R.id.flashLightIv);
 
diff --git a/zxinglibrary/src/main/res/layout/capture.xml b/zxinglibrary/src/main/res/layout/capture.xml
index 446df6d..0bcdd7a 100644
--- a/zxinglibrary/src/main/res/layout/capture.xml
+++ b/zxinglibrary/src/main/res/layout/capture.xml
@@ -41,6 +41,7 @@
             android:layout_height="42dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
+            android:visibility="gone"
             android:layout_alignTop="@+id/capture_imageview_back"
             android:src="@drawable/open" />