Control commit
This commit is contained in:
parent
986cf8cf9a
commit
fbe834b8e2
5 changed files with 11 additions and 21 deletions
|
@ -16,16 +16,15 @@ import androidx.core.view.WindowInsetsCompat;
|
|||
|
||||
import android.Manifest;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.util.Log;
|
||||
|
||||
|
||||
import com.example.cameraxtestappjava.segpass.camera.view.AutoFitTextureView;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.SegpassCameraCallback;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.SegpassPermissionListener;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.SegpassPermissionCallback;
|
||||
import com.example.cameraxtestappjava.databinding.ActivityCameraNewBinding;
|
||||
import com.example.cameraxtestappjava.segpass.SegpassCamera;
|
||||
|
||||
public class CameraActivityNew extends AppCompatActivity implements ActivityCompat.OnRequestPermissionsResultCallback, SegpassCameraCallback, SegpassPermissionListener {
|
||||
public class CameraActivityNew extends AppCompatActivity implements ActivityCompat.OnRequestPermissionsResultCallback, SegpassCameraCallback, SegpassPermissionCallback {
|
||||
|
||||
private static final String TAG = "CameraActivityNew";
|
||||
ActivityCameraNewBinding binding;
|
||||
|
|
|
@ -1,23 +1,14 @@
|
|||
package com.example.cameraxtestappjava;
|
||||
|
||||
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.view.TextureView;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.activity.EdgeToEdge;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.graphics.Insets;
|
||||
import androidx.core.view.ViewCompat;
|
||||
import androidx.core.view.WindowInsetsCompat;
|
||||
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.SegpassCameraCallback;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.SegpassPermissionListener;
|
||||
import com.example.cameraxtestappjava.databinding.ActivityCameraBinding;
|
||||
|
||||
public class CameraActivityOld extends AppCompatActivity {
|
||||
|
|
|
@ -36,10 +36,10 @@ import androidx.core.content.ContextCompat;
|
|||
|
||||
import com.example.cameraxtestappjava.segpass.camera.exceptions.SegpassCameraException;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.CompareSizesByArea;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.ImageSaver;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.ImageSaverUtil;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.ImageEncodingCallback;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.SegpassCameraCallback;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.SegpassPermissionListener;
|
||||
import com.example.cameraxtestappjava.segpass.camera.utils.SegpassPermissionCallback;
|
||||
import com.example.cameraxtestappjava.segpass.camera.view.AutoFitTextureView;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
@ -60,7 +60,7 @@ public class SegpassCamera {
|
|||
* Class variabels
|
||||
*/
|
||||
AppCompatActivity mActivity;
|
||||
SegpassPermissionListener mPermissionListener;
|
||||
SegpassPermissionCallback mPermissionListener;
|
||||
SegpassCameraCallback mCameraCallback;
|
||||
|
||||
/**
|
||||
|
@ -159,10 +159,10 @@ public class SegpassCamera {
|
|||
/**
|
||||
* @param activity Parent activity where the camera is called from.
|
||||
* @param textureView {@link AutoFitTextureView} where the camera preview is shown.
|
||||
* @param listener {@link SegpassPermissionListener} that deals with camera and storage permissions.
|
||||
* @param listener {@link SegpassPermissionCallback} that deals with camera and storage permissions.
|
||||
* @param cameraCallback {@link SegpassCameraCallback} that deals with operation results.
|
||||
*/
|
||||
public SegpassCamera(AppCompatActivity activity, AutoFitTextureView textureView, SegpassPermissionListener listener, SegpassCameraCallback cameraCallback) {
|
||||
public SegpassCamera(AppCompatActivity activity, AutoFitTextureView textureView, SegpassPermissionCallback listener, SegpassCameraCallback cameraCallback) {
|
||||
mActivity = activity;
|
||||
mTextureView = textureView;
|
||||
mPermissionListener = listener;
|
||||
|
@ -251,7 +251,7 @@ public class SegpassCamera {
|
|||
* still image is ready to be saved (or sent to be encoded to base64)
|
||||
*/
|
||||
private final ImageReader.OnImageAvailableListener mOnImageAvailableListener = reader ->
|
||||
mBackgroundHandler.post(new ImageSaver(reader.acquireNextImage(), base64Callback));
|
||||
mBackgroundHandler.post(new ImageSaverUtil(reader.acquireNextImage(), base64Callback));
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -5,7 +5,7 @@ import android.util.Base64;
|
|||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public class ImageSaver implements Runnable {
|
||||
public class ImageSaverUtil implements Runnable {
|
||||
|
||||
/**
|
||||
* The JPEG image
|
||||
|
@ -13,7 +13,7 @@ public class ImageSaver implements Runnable {
|
|||
private final Image mImage;
|
||||
private final ImageEncodingCallback mCallback;
|
||||
|
||||
public ImageSaver(Image image, ImageEncodingCallback callback) {
|
||||
public ImageSaverUtil(Image image, ImageEncodingCallback callback) {
|
||||
mImage = image;
|
||||
mCallback = callback;
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
package com.example.cameraxtestappjava.segpass.camera.utils;
|
||||
|
||||
public interface SegpassPermissionListener {
|
||||
public interface SegpassPermissionCallback {
|
||||
void onPermissionRequest();
|
||||
void onPermissionGranted();
|
||||
void onPermissionDenied();
|
Loading…
Reference in a new issue