From 930ccf7eff351a029c66099bb181b175c9c0bf68 Mon Sep 17 00:00:00 2001
From: Thomas BOY <thomas.boy@geneanet.org>
Date: Wed, 28 Jan 2015 14:41:05 +0100
Subject: [PATCH] =?UTF-8?q?Premi=C3=A8re=20impl=C3=A9mentation=20du=20swit?=
 =?UTF-8?q?ch=20camera=20->=20Marche=20de=20camera=20back=20=C3=A0=20camer?=
 =?UTF-8?q?a=20front=20mais=20pas=20l'inverse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/drawable-hdpi/switch_camera.png       | Bin 0 -> 4646 bytes
 .../res/layout/activity_camera_view.xml       |   9 ++
 .../geneanet/customcamera/CameraActivity.java | 109 ++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 src/android/customCamera/res/drawable-hdpi/switch_camera.png

diff --git a/src/android/customCamera/res/drawable-hdpi/switch_camera.png b/src/android/customCamera/res/drawable-hdpi/switch_camera.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a69823276a17e267cdafdb4f87faf00ca4f82ac
GIT binary patch
literal 4646
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

literal 0
HcmV?d00001

diff --git a/src/android/customCamera/res/layout/activity_camera_view.xml b/src/android/customCamera/res/layout/activity_camera_view.xml
index 146fc05..4fdec41 100644
--- a/src/android/customCamera/res/layout/activity_camera_view.xml
+++ b/src/android/customCamera/res/layout/activity_camera_view.xml
@@ -30,6 +30,15 @@
         android:onClick="switchFlash"
         android:src="@drawable/flash" />
 
+    <ImageButton
+        android:id="@+id/switchCamera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="false"
+        android:layout_marginTop="300dp"
+        android:src="@drawable/switch_camera"
+        android:onClick="switchCamera" />
+
     <LinearLayout
         android:id="@+id/beforePhoto"
         android:layout_width="match_parent"
diff --git a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
index 65c3863..8c6519a 100644
--- a/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
+++ b/src/android/customCamera/src/org/geneanet/customcamera/CameraActivity.java
@@ -59,6 +59,8 @@ public class CameraActivity extends Activity {
   private Boolean opacity = true;
   // Flag to save state of flash -> 0 : off, 1 : on, 2 : auto. 
   private int stateFlash = 0;
+  // Flag to know which camera is active.
+  private int cameraActive = getOrientationOfCamera();
 
   public static final int DEGREE_0 = 0;
   public static final int DEGREE_90 = 90;
@@ -890,6 +892,7 @@ public class CameraActivity extends Activity {
     this.setResult(3);
     this.finish();
   }
+<<<<<<< HEAD
   
   /**
    * Allow to enable or disable the flash of the camera.
@@ -991,4 +994,110 @@ public class CameraActivity extends Activity {
       (supportedFlashModes.size() == 1 && supportedFlashModes.get(0).equals(Camera.Parameters.FLASH_MODE_OFF))
     );
   }
+||||||| merged common ancestors
+=======
+  
+  /**
+   * Check if a front camera exist.
+   * return boolean
+   */
+  public boolean hasFrontCamera() {
+    int numCameras = Camera.getNumberOfCameras();
+    for (int i = 0; i < numCameras; i++) {
+      Camera.CameraInfo info = new CameraInfo();
+      Camera.getCameraInfo(i, info);
+      if (CameraInfo.CAMERA_FACING_FRONT == info.facing) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  /**
+   * To change the active camera.
+   * @param view The current view.
+   */
+  public void switchCamera(View view) {
+    if (hasFrontCamera()) {
+      System.out.println("Camera frontale OK !");
+      System.out.println("Camera face : " + Camera.CameraInfo.CAMERA_FACING_FRONT);
+      System.out.println("Camera back : " + Camera.CameraInfo.CAMERA_FACING_BACK);
+      
+      int orientationCamera = getOrientationOfCamera();
+      System.out.println("Orientation camera : " + orientationCamera);
+      
+      System.out.println("Camera Active : " + cameraActive);
+      
+//      int cameraCount = Camera.getNumberOfCameras();
+//      System.out.println("nb Camera : " + cameraCount);
+//      for ( int camIdx = 0; camIdx < cameraCount; camIdx++ ) {
+//        System.out.println("ok");
+//        Camera.getCameraInfo( camIdx, cameraInfo );
+//        if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT ) {
+//          System.out.println("Je l'ai trouvé !! ");
+//          try {
+//            customCamera = Camera.open(camIdx);
+//            CameraPreview myPreview = new CameraPreview(this, customCamera);
+//            cameraPreview.addView(myPreview);
+//          } catch (RuntimeException e) {
+//            System.out.println("FAIL");
+//          }
+//        }
+      ManagerCamera.clearCameraAccess();
+      FrameLayout cameraPreview = (FrameLayout) findViewById(R.id.camera_preview);
+      cameraPreview.removeAllViews();
+      if (cameraActive == Camera.CameraInfo.CAMERA_FACING_BACK) {
+        try {
+          cameraActive = 1;
+          customCamera = Camera.open(Camera.CameraInfo.CAMERA_FACING_FRONT);
+          setCameraDisplayOrientation(CameraActivity.this, 1, customCamera);
+          CameraPreview myPreview = new CameraPreview(this, customCamera);
+          cameraPreview.addView(myPreview);
+        } catch (RuntimeException e) {
+          System.out.println("FAIL");
+        }
+      } else if (cameraActive == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+        try {
+          cameraActive = 0;
+          customCamera = Camera.open(Camera.CameraInfo.CAMERA_FACING_BACK);
+          System.out.println("J'ai réussi !! ");
+          CameraPreview myPreview = new CameraPreview(this, customCamera);
+          cameraPreview.addView(myPreview);
+        } catch (RuntimeException e) {
+          System.out.println("FAIL");
+        }
+      }
+    }
+  }
+  
+  /**
+   * 
+   * @param activity
+   * @param cameraId
+   * @param camera
+   */
+  public static void setCameraDisplayOrientation(Activity activity,
+      int cameraId, android.hardware.Camera camera) {
+    Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
+    Camera.getCameraInfo(cameraId, info);
+    int rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+    int degrees = 0;
+    switch (rotation) {
+      case Surface.ROTATION_0: degrees = 0; break;
+      case Surface.ROTATION_90: degrees = 90; break;
+      case Surface.ROTATION_180: degrees = 180; break;
+      case Surface.ROTATION_270: degrees = 270; break;
+      default : break;
+    }
+
+    int result;
+    if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+      result = (info.orientation + degrees) % 360;
+      result = (360 - result) % 360;  // compensate the mirror
+    } else {  // back-facing
+      result = (info.orientation - degrees + 360) % 360;
+    }
+    camera.setDisplayOrientation(result);
+  }
+>>>>>>> Première implémentation du switch camera -> Marche de camera back à camera front mais pas l'inverse
 }