From 4572d8b17a2e09e4495b55744bb6dc11eb5696cd Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 13 二月 2020 16:02:06 +0800
Subject: [PATCH] 更新MapFragment
---
app/src/main/java/safeluck/drive/evaluation/fragment/TakePhotoFragment.java | 9 ++++++++-
app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java | 17 ++++++++++-------
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
index 07df6dc..ae09668 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/MapFragment.java
@@ -209,9 +209,9 @@
if (canvas2 == null || bmp == null) {
return;
}
- _mActivity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
+// _mActivity.runOnUiThread(new Runnable() {
+// @Override
+// public void run() {
double base_x = 100, base_y = 100;
double max_x = 0, min_x = 0, max_y = 0, min_y = 0;
@@ -331,10 +331,13 @@
// 鎻愪氦鐢诲竷
Canvas canvas = holder.lockCanvas();
- canvas.drawBitmap(bmp, 0, 0, paint);
- holder.unlockCanvasAndPost(canvas);
- }
- });
+ if (canvas != null){
+
+ canvas.drawBitmap(bmp, 0, 0, paint);
+ holder.unlockCanvasAndPost(canvas);
+ }
+// }
+// });
}
public void CCL(final int c, final int who) {
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