修复拍照和摄影App在后台是无法恢复

chengzichen · May 25, 2017 · 1fc1e1c · 1fc1e1c
1 parent d2f1027
commit 1fc1e1c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
+/.idea
 .DS_Store
 /build
 /captures

diff --git a/gallery/src/main/java/com/dhc/gallery/ui/CameraActivity.java b/gallery/src/main/java/com/dhc/gallery/ui/CameraActivity.java
@@ -110,10 +110,12 @@ public void onFragmentDestroy() {
             return;
         }
         hideCamera(true);
+        if(cameraView!=null){
         cameraView.destroy(true, null);
         FrameLayout frameLayout = (FrameLayout) fragmentView;
         frameLayout.removeView(cameraView);
         cameraView = null;
+        }
         fragmentView = null;
         if (mBaseDialog != null)
             mBaseDialog.dismiss();
@@ -123,7 +125,7 @@ public void onFragmentDestroy() {
     @Override
     public void didReceivedNotification(int id, Object... args) {
         if (id == NotificationCenter.cameraInitied) {
-            checkCamera(false);
+            checkCamera(true);
             cameraPanel.bringToFront();
             recordTime.bringToFront();
         }
@@ -156,7 +158,7 @@ public boolean onTouchEvent(MotionEvent event) {
 
     private void initView(final Context context) {
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.cameraInitied);
-        checkCamera(false);
+        checkCamera(true);
         if (deviceHasGoodCamera) {
             CameraController.getInstance().initCamera();
         }
@@ -546,7 +548,7 @@ public void onResume() {
         if (paused) {
             if (mGalleryConfig == null)
                 mGalleryConfig = getArguments().getParcelable(GALLERY_CONFIG);
-            checkCamera(false);
+            checkCamera(true);
             cameraPanel.bringToFront();
             recordTime.bringToFront();
         }
@@ -628,6 +630,9 @@ public void hideCamera(boolean async) {
             return;
         }
         cameraView.destroy(async, null);
+        FrameLayout frameLayout = (FrameLayout) fragmentView;
+        frameLayout.removeView(cameraView);
+        cameraView = null;
         cameraOpened = false;
     }