Commit 02018e6a by wanglei

format

1 parent 82562f90
...@@ -129,15 +129,12 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList ...@@ -129,15 +129,12 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList
cropToFrameTransform = new Matrix(); cropToFrameTransform = new Matrix();
frameToCropTransform.invert(cropToFrameTransform); frameToCropTransform.invert(cropToFrameTransform);
trackingOverlay = (OverlayView) findViewById(R.id.tracking_overlay); trackingOverlay = findViewById(R.id.tracking_overlay);
trackingOverlay.addCallback(new DrawCallback() { trackingOverlay.addCallback(canvas -> {
@Override
public void drawCallback(final Canvas canvas) {
tracker.draw(canvas); tracker.draw(canvas);
if (isDebug()) { if (isDebug()) {
tracker.drawDebug(canvas); tracker.drawDebug(canvas);
} }
}
}); });
tracker.setFrameConfiguration(previewWidth, previewHeight, sensorOrientation); tracker.setFrameConfiguration(previewWidth, previewHeight, sensorOrientation);
...@@ -232,9 +229,7 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList ...@@ -232,9 +229,7 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList
ImageUtils.saveBitmap(croppedBitmap); ImageUtils.saveBitmap(croppedBitmap);
} }
runInBackground(new Runnable() { runInBackground(() -> {
@Override
public void run() {
LOGGER.i("Running detection on image " + currTimestamp); LOGGER.i("Running detection on image " + currTimestamp);
final long startTime = SystemClock.uptimeMillis(); final long startTime = SystemClock.uptimeMillis();
final List<Classifier.Recognition> results = detector.recognizeImage(croppedBitmap); final List<Classifier.Recognition> results = detector.recognizeImage(croppedBitmap);
...@@ -243,7 +238,7 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList ...@@ -243,7 +238,7 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList
Log.e("CHECK", "run: " + results.size()); Log.e("CHECK", "run: " + results.size());
cropCopyBitmap = Bitmap.createBitmap(croppedBitmap); cropCopyBitmap = Bitmap.createBitmap(croppedBitmap);
final Canvas canvas = new Canvas(cropCopyBitmap); final Canvas canvas1 = new Canvas(cropCopyBitmap);
final Paint paint = new Paint(); final Paint paint = new Paint();
paint.setColor(Color.RED); paint.setColor(Color.RED);
paint.setStyle(Style.STROKE); paint.setStyle(Style.STROKE);
...@@ -261,7 +256,7 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList ...@@ -261,7 +256,7 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList
for (final Classifier.Recognition result : results) { for (final Classifier.Recognition result : results) {
final RectF location = result.getLocation(); final RectF location = result.getLocation();
if (location != null && result.getConfidence() >= minimumConfidence) { if (location != null && result.getConfidence() >= minimumConfidence) {
canvas.drawRect(location, paint); canvas1.drawRect(location, paint);
cropToFrameTransform.mapRect(location); cropToFrameTransform.mapRect(location);
...@@ -280,7 +275,6 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList ...@@ -280,7 +275,6 @@ public class MainActivity extends CameraActivity implements OnImageAvailableList
showCropInfo(cropCopyBitmap.getWidth() + "x" + cropCopyBitmap.getHeight()); showCropInfo(cropCopyBitmap.getWidth() + "x" + cropCopyBitmap.getHeight());
showInference(lastProcessingTimeMs + "ms"); showInference(lastProcessingTimeMs + "ms");
}); });
}
}); });
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!