From c1d12a10d0b1c823cc2df9ee6470d22d55035a12 Mon Sep 17 00:00:00 2001 From: Bastian Kohler Date: Fri, 2 Jun 2023 11:34:37 +0200 Subject: [PATCH] Unstaged two Main and Main xml for merge --- .../ueberwachungssystem/MainActivity.java | 87 ------------------- app/src/main/res/layout/activity_main.xml | 37 -------- 2 files changed, 124 deletions(-) delete mode 100644 app/src/main/java/com/example/ueberwachungssystem/MainActivity.java delete mode 100644 app/src/main/res/layout/activity_main.xml diff --git a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java b/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java deleted file mode 100644 index 535f77d..0000000 --- a/app/src/main/java/com/example/ueberwachungssystem/MainActivity.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.example.ueberwachungssystem; - -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.camera.view.PreviewView; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; -import androidx.camera.core.ExperimentalGetImage; - -import android.Manifest; -import android.content.pm.PackageManager; -import android.os.Bundle; -import android.view.View; -import android.widget.TextView; -import android.widget.Toast; -import android.widget.ToggleButton; - -import com.example.ueberwachungssystem.Detection.DetectionReport; -import com.example.ueberwachungssystem.Detection.VideoDetector; - -@ExperimentalGetImage -public class MainActivity extends AppCompatActivity { - - private static final int CAMERA_PERMISSION_REQUEST_CODE = 101; - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - TextView textView = findViewById(R.id.textView); - PreviewView previewView = findViewById(R.id.previewView); - - - VideoDetector vd = new VideoDetector(this); - vd.setPreviewView(previewView); - vd.setOnDetectionListener(new VideoDetector.OnDetectionListener() { - @Override - public void onDetection(@NonNull DetectionReport detectionReport) { - detectionReport.log("OnDetection"); - textView.setText(detectionReport.toString()); - } - }); - //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() { - return ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED; - } - - private void getCameraAccess() { - if (!isCameraAccessAllowed()) - ActivityCompat.requestPermissions(this, new String[]{android.Manifest.permission.CAMERA}, CAMERA_PERMISSION_REQUEST_CODE); - } - - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - - if (requestCode == CAMERA_PERMISSION_REQUEST_CODE && grantResults.length > 0) { - boolean cameraRights = grantResults[0] == PackageManager.PERMISSION_GRANTED; - if (cameraRights) { - Toast.makeText(this, "camera permission granted", Toast.LENGTH_LONG).show(); - } else { - Toast.makeText(this, "camera permission denied", Toast.LENGTH_LONG).show(); - } - } - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml deleted file mode 100644 index 275c453..0000000 --- a/app/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file