Compare commits

..

No commits in common. "daaf8735de2fb37dbb5f7a3301324ef30e43affe" and "19d1bfe1e313bbe2656db93ab8a8a6a75ee0ebe7" have entirely different histories.

4 changed files with 30 additions and 19 deletions

View File

@ -3,10 +3,7 @@
xmlns:tools="http://schemas.android.com/tools">
<uses-feature android:name="android.hardware.camera"/>
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-feature android:name="android.hardware.Camera"/>
<uses-permission android:name="android.permission.CAMERA"/>
<application
android:allowBackup="true"

View File

@ -10,20 +10,17 @@ import androidx.camera.core.ExperimentalGetImage;
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
import android.widget.VideoView;
import com.example.ueberwachungssystem.VideoDetection.VideoDetector;
@ExperimentalGetImage
public class MainActivity extends AppCompatActivity {
private static final int CAMERA_PERMISSION_REQUEST_CODE = 100;
private static final int RECORD_VIDEO_PERMISSION_REQUEST_CODE = 102;
private static final int CAMERA_PERMISSION_REQUEST_CODE = 101;
@Override
@ -34,7 +31,6 @@ public class MainActivity extends AppCompatActivity {
TextView textView = findViewById(R.id.textView);
PreviewView previewView = findViewById(R.id.previewView);
getCameraAccess();
VideoDetector vd = new VideoDetector(this);
vd.setPreviewView(previewView);
@ -42,11 +38,27 @@ public class MainActivity extends AppCompatActivity {
@Override
public void onDetection(@NonNull DetectionReport detectionReport) {
detectionReport.log("OnDetection");
textView.setText("Alarm:\t[" + String.valueOf(detectionReport.detectedValue) + "]");
textView.setText(detectionReport.toString());
}
});
vd.startDetection();
//vd.startDetection();
ToggleButton toggleButton = findViewById(R.id.previewButton);
toggleButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
getCameraAccess();
if (isCameraAccessAllowed() && toggleButton.isChecked())
{
vd.startDetection();
}
else {
vd.stopDetection();
textView.setText("");
}
}
});
}
private boolean isCameraAccessAllowed() {
@ -65,9 +77,9 @@ public class MainActivity extends AppCompatActivity {
if (requestCode == CAMERA_PERMISSION_REQUEST_CODE && grantResults.length > 0) {
boolean cameraRights = grantResults[0] == PackageManager.PERMISSION_GRANTED;
if (cameraRights) {
Toast.makeText(this, "permission granted", Toast.LENGTH_LONG).show();
Toast.makeText(this, "camera permission granted", Toast.LENGTH_LONG).show();
} else {
Toast.makeText(this, "permission denied", Toast.LENGTH_LONG).show();
Toast.makeText(this, "camera permission denied", Toast.LENGTH_LONG).show();
}
}
}

View File

@ -33,7 +33,7 @@ public class VideoDetector extends Detector {
private PreviewView previewView = null;
// Detect Violation
private static final float PIXEL_THRESHOLD = 30f; // Luminosity (brightness channel of YUV_420_888)
private static final float ALARM_THRESHOLD = 0.5f; // Percent of pixels changed
private static final float ALARM_THRESHOLD = 1f; // Percent of pixels changed
private ByteBuffer previousBuffer = null;
@ -117,7 +117,6 @@ public class VideoDetector extends Detector {
if (previewView != null)
preview.setSurfaceProvider(previewView.getSurfaceProvider());
cameraProvider.unbindAll();
cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview);
}

View File

@ -14,21 +14,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textSize="30sp"
android:textSize="20dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ToggleButton
android:id="@+id/previewButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="ToggleButton" />
<androidx.camera.view.PreviewView
android:id="@+id/previewView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:backgroundTint="@android:color/black">
</androidx.camera.view.PreviewView>
android:backgroundTint="@android:color/black"/>
</LinearLayout>