1. 解决少数机型拍照或对焦崩溃的问题 2. 解决用户裁剪的宽或高为0导致崩溃的问题

Author: wildma

idcardcamera/src/main/java/com/wildma/idcardcamera/camera/CameraActivity.java

@@ -294,6 +294,10 @@ private void confirm() {
         mCropImageView.crop(new CropListener() {
             @Override
             public void onFinish(Bitmap bitmap) {
+                if(bitmap == null) {
+                    Toast.makeText(getApplicationContext(), getString(R.string.crop_fail), Toast.LENGTH_SHORT).show();
+                    finish();
+                }
 
                 /*保存图片到sdcard并返回图片路径*/
                 if (FileUtils.createOrExistsDir(Constant.DIR_ROOT)) {

idcardcamera/src/main/java/com/wildma/idcardcamera/camera/CameraPreview.java

@@ -166,7 +166,11 @@ private void release() {
      */
     public void focus() {
         if (camera != null) {
-            camera.autoFocus(null);
+            try {
+                camera.autoFocus(null);
+            } catch (Exception e) {
+                Log.d(TAG, "takePhoto " + e);
+            }
         }
     }
 
@@ -198,8 +202,11 @@ public boolean switchFlashLight() {
      */
     public void takePhoto(Camera.PictureCallback pictureCallback) {
         if (camera != null) {
-            camera.takePicture(null, null, pictureCallback);
-            //            camera.stopPreview();
+            try {
+                camera.takePicture(null, null, pictureCallback);
+            } catch (Exception e) {
+                Log.d(TAG, "takePhoto " + e);
+            }
         }
     }
 

idcardcamera/src/main/java/com/wildma/idcardcamera/cropper/CropOverlayView.java

@@ -370,6 +370,10 @@ public void crop(CropListener cropListener, boolean needStretch) {
                 Math.max(bitmapBottomRight.x, bitmapTopRight.x),
                 Math.max(bitmapBottomRight.y, bitmapBottomLeft.y));
 
+        if(cropRect.width() <= 0 || cropRect.height() <= 0) { //用户裁剪的宽或高为0
+            cropListener.onFinish(null);
+            return;
+        }
         Bitmap cut = Bitmap.createBitmap(
                 output,
                 cropRect.left,

idcardcamera/src/main/res/values/strings.xml

@@ -2,4 +2,5 @@
     <string name="app_name">IDCardCamera</string>
 
     <string name="touch_to_focus">触摸屏幕对焦</string>
+    <string name="crop_fail">裁剪失败</string>
 </resources>