v0.2.0; add burst support, default to 5;

Signed-off-by: Jerry Chen <jerryc05@qq.com>
jerryc05 · Jul 16, 2019 · 33a3a9f · 33a3a9f
1 parent cdf520e
commit 33a3a9f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 50 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 29
         versionCode 1
-        versionName "0.1.3"
+        versionName "0.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs "xxhdpi"
     }

diff --git a/app/src/main/java/jerryc05/unlockme/helpers/camera/Camera1APIHelper.java b/app/src/main/java/jerryc05/unlockme/helpers/camera/Camera1APIHelper.java
@@ -47,19 +47,6 @@ private static void openCamera1(final Context context) {
       mCamera = Camera.open(cameraID);
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
         mCamera.enableShutterSound(false);
-
-//      final Camera.Parameters mCameraParameters = mCamera.getParameters();
-//      final List<Camera.Size> sizes             = mCameraParameters.getSupportedPictureSizes();
-//      final Camera.Size mSize = Collections.max(sizes, new Comparator<Camera.Size>() {
-//        @Override
-//        public int compare(Camera.Size prev, Camera.Size next) {
-//          final int width = prev.width - next.width;
-//          return width != 0 ? width
-//                  : prev.height - next.height;
-//        }
-//      });
-//      mCameraParameters.setPictureSize(mSize.width, mSize.height);
-//      mCamera.setParameters(mCameraParameters);
     } catch (Exception e) {
       UserInterface.showExceptionToNotification(
               e.toString(), "openCamera1()", context);
@@ -70,8 +57,12 @@ private static void captureCamera1(final Context context) {
     try {
       mCamera.setPreviewTexture(new SurfaceTexture(-1));
       mCamera.startPreview();
-      mCamera.takePicture(null, null,
-              getJpegPictureCallback(context));
+
+      for (int i = 0; i < imageCount; i++) {
+        mCamera.takePicture(null, null,
+                getJpegPictureCallback(context));
+        Thread.sleep(100);
+      }
 
     } catch (Exception e) {
       closeCamera1(mCamera);
@@ -95,7 +86,7 @@ public void onPictureTaken(byte[] data, Camera camera) {
 
   @SuppressWarnings("WeakerAccess")
   static void closeCamera1(Camera camera) {
-    if(BuildConfig.DEBUG)
+    if (BuildConfig.DEBUG)
       Log.d(TAG, "closeCamera1: ");
 
     camera.stopPreview();

diff --git a/app/src/main/java/jerryc05/unlockme/helpers/camera/Camera2APIHelper.java b/app/src/main/java/jerryc05/unlockme/helpers/camera/Camera2APIHelper.java
@@ -183,8 +183,12 @@ public void onConfigured(CameraCaptureSession cameraCaptureSession) {
             Log.d(TAG, "mCaptureStillImageStateCallback#onConfigured: ");
           try {
             mCameraCaptureSession = cameraCaptureSession;
-            cameraCaptureSession.capture(getStillImageCaptureRequest(context),
-                    getCaptureCallback(), null);
+
+            for (int i = 0; i < imageCount; i++) {
+              cameraCaptureSession.capture(getStillImageCaptureRequest(context),
+                      getCaptureCallback(), null);
+              Thread.sleep(100);
+            }
 
           } catch (final Exception e) {
             UserInterface.showExceptionToNotification(e.toString(),
@@ -237,7 +241,7 @@ static CaptureRequest getStillImageCaptureRequest(final Context context)
                       ((Activity) context).getWindowManager()
                               .getDefaultDisplay().getRotation()));
     else
-      mCaptureRequestBuilder.set(CaptureRequest.JPEG_ORIENTATION,270);
+      mCaptureRequestBuilder.set(CaptureRequest.JPEG_ORIENTATION, 270);
 
     return mCaptureRequestBuilder.build();
   }
@@ -295,34 +299,6 @@ public void onCaptureCompleted(CameraCaptureSession session,
           if (BuildConfig.DEBUG)
             Log.d(TAG, "mCaptureCallback#onCaptureCompleted: ");
 
-//          final CaptureRequest.Builder mCaptureRequestBuilder;
-//          try {
-//            mCaptureRequestBuilder = mCameraDevice
-//                    .createCaptureRequest(CameraDevice.TEMPLATE_MANUAL);
-//            mCaptureRequestBuilder.set(
-//                    CaptureRequest.CONTROL_AE_MODE,
-//                    CaptureRequest.CONTROL_AE_MODE_OFF
-//            );
-//            mCaptureRequestBuilder.set(
-//                    CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
-//                    CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_IDLE
-//            );
-//            mCaptureRequestBuilder.set(
-//                    CaptureRequest.CONTROL_AF_MODE,
-//                    CameraMetadata.CONTROL_AF_MODE_OFF
-//            );
-//            mCaptureRequestBuilder.set(
-//                    CaptureRequest.CONTROL_AF_TRIGGER,
-//                    CameraMetadata.CONTROL_AF_TRIGGER_CANCEL
-//            );
-////            mCaptureRequestBuilder.addTarget(getCaptureImageReader().getSurface());
-//            mCaptureRequestBuilder.addTarget(getPreviewImageReader().getSurface());
-//
-//            session.capture(mCaptureRequestBuilder.build(),
-//                    null, null);
-//          } catch (Exception e) {
-//            UserInterface.showExceptionToDialog(activity, e);
-//          }
           closeCamera2();
         }
       };

diff --git a/app/src/main/java/jerryc05/unlockme/helpers/camera/CameraBaseAPIClass.java b/app/src/main/java/jerryc05/unlockme/helpers/camera/CameraBaseAPIClass.java
@@ -33,6 +33,7 @@ public abstract class CameraBaseAPIClass {
   private static final boolean canUseCamera2 =
           Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
   public static        boolean isFront       = true;
+  static               int     imageCount    = 5;
 
   @SuppressWarnings("unused")
   public static void getImageFromDefaultCamera(final Context context,

diff --git a/app/src/main/java/jerryc05/unlockme/services/ForegroundService.java b/app/src/main/java/jerryc05/unlockme/services/ForegroundService.java
@@ -17,6 +17,7 @@
 import jerryc05.unlockme.receivers.MyDeviceAdminReceiver;
 
 import static jerryc05.unlockme.helpers.UserInterface.notifyToForegroundService;
+import static jerryc05.unlockme.helpers.camera.CameraBaseAPIClass.getImageFromDefaultCamera;
 
 public class ForegroundService extends Service {
 
@@ -57,9 +58,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
       @Override
       public void run() {
         if (ACTION_UPDATE_NOTIFICATION.equals(intent.getAction()))
-          UserInterface.notifyToForegroundService(ForegroundService.this);
+          notifyToForegroundService(ForegroundService.this);
         else
-          CameraBaseAPIClass.getImageFromDefaultCamera(
+          getImageFromDefaultCamera(
                   ForegroundService.this, true);
       }
     });