From 806ed6836b84fbea87d19a0cb4414e120dd9c049 Mon Sep 17 00:00:00 2001
From: fctom1215 <fctom1215@outlook.com>
Date: 星期五, 14 二月 2020 14:30:44 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/fragment/TakePhotoFragment.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TakePhotoFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TakePhotoFragment.java
index 2af4a2f..9d8bccf 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TakePhotoFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TakePhotoFragment.java
@@ -35,6 +35,7 @@
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
+import android.text.TextUtils;
import android.util.Log;
import android.util.SparseIntArray;
import android.view.LayoutInflater;
@@ -619,7 +620,13 @@
if (!mCameraOpenCloseLock.tryAcquire(2500, TimeUnit.MILLISECONDS)) {
throw new RuntimeException("Time out waiting to lock camera opening.");
}
- manager.openCamera(mCameraId, mStateCallback, mBackgroundHandler);
+ if(!TextUtils.isEmpty(mCameraId)){
+
+ manager.openCamera(mCameraId, mStateCallback, mBackgroundHandler);
+ }else{
+ MyLog.i(TAG,"CameraID--null");
+
+ }
} catch (CameraAccessException e) {
e.printStackTrace();
} catch (InterruptedException e) {
--
Gitblit v1.8.0