From 9f37b1a964274c6706fab281dfeff7e21964fbd5 Mon Sep 17 00:00:00 2001
From: jiangdongguo <765067602@qq.com>
Date: Mon, 20 Nov 2017 14:46:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=9C=BA?=
 =?UTF-8?q?=E5=9E=8BActivity=E4=B8=8D=E5=8F=AF=E8=A7=81=E6=97=B6=EF=BC=8CC?=
 =?UTF-8?q?amera=E9=A2=84=E8=A7=88=E5=A4=B1=E8=B4=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../usbcamera/view/USBCameraActivity.java     | 22 +++++++++++++++++--
 .../jiangdg/usbcamera/USBCameraManager.java   |  7 ++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 15edc11..e1ff0f4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <!--全局异常检测，需添加-->
     <!--android:name=".application.MyApplication"-->
     <application
+        android:name=".application.MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/jiangdg/usbcamera/view/USBCameraActivity.java b/app/src/main/java/com/jiangdg/usbcamera/view/USBCameraActivity.java
index af66e9c..cacab4f 100644
--- a/app/src/main/java/com/jiangdg/usbcamera/view/USBCameraActivity.java
+++ b/app/src/main/java/com/jiangdg/usbcamera/view/USBCameraActivity.java
@@ -62,6 +62,7 @@ public class USBCameraActivity extends AppCompatActivity implements CameraDialog
     private CameraViewInterface mUVCCameraView;
 
     private boolean isRequest;
+    private boolean isPreview;
 
     /**
      * USB设备事件监听器
@@ -99,6 +100,9 @@ public class USBCameraActivity extends AppCompatActivity implements CameraDialog
         public void onConnectDev(UsbDevice device,boolean isConnected) {
             if(! isConnected) {
                 showShortMsg("连接失败，请检查分辨率参数是否正确");
+                isPreview = false;
+            }else{
+                isPreview = true;
             }
         }
 
@@ -125,10 +129,20 @@ public class USBCameraActivity extends AppCompatActivity implements CameraDialog
     @Override
     protected void onStart() {
         super.onStart();
+        if(mUSBManager == null)
+            return;
         // 注册USB事件广播监听器
-        if(mUSBManager != null){
-            mUSBManager.registerUSB();
+        mUSBManager.registerUSB();
+        if(!isPreview && mUSBManager.isCameraOpened()) {
+            mUSBManager.startPreview(mUVCCameraView, new AbstractUVCCameraHandler.OnPreViewResultListener() {
+                @Override
+                public void onPreviewResult(boolean result) {
+
+                }
+            });
+            isPreview = true;
         }
+
     }
 
     @Override
@@ -138,6 +152,10 @@ public class USBCameraActivity extends AppCompatActivity implements CameraDialog
         if(mUSBManager != null){
             mUSBManager.unregisterUSB();
         }
+        if(isPreview && mUSBManager.isCameraOpened()) {
+            mUSBManager.stopPreview();
+            isPreview = false;
+        }
     }
 
     @OnClick({ R.id.btn_contrast,R.id.btn_brightness,R.id.btn_capture_pic, R.id.btn_rec_video,R.id.btn_update_resolution,R.id.btn_restart_camera})
diff --git a/libusbcamera/src/main/java/com/jiangdg/usbcamera/USBCameraManager.java b/libusbcamera/src/main/java/com/jiangdg/usbcamera/USBCameraManager.java
index fc26587..6e27743 100644
--- a/libusbcamera/src/main/java/com/jiangdg/usbcamera/USBCameraManager.java
+++ b/libusbcamera/src/main/java/com/jiangdg/usbcamera/USBCameraManager.java
@@ -338,6 +338,13 @@ public class USBCameraManager{
         }
     }
 
+    // 停止预览
+    public void stopPreview() {
+        if(mCameraHandler != null){
+            mCameraHandler.stopPreview();
+        }
+    }
+
     // Camera对焦
     public void startCameraFoucs(){
         if(mCameraHandler != null){