siebenhaarmi76624/MDT5_1_Ueberwachungssystem_G1
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/bk_video' into bk_video

Browse Source
This commit is contained in:
Bastian Kohler 2023-06-01 07:22:57 +02:00
commit daaf8735de
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/AndroidManifest.xml
View File

@ -3,7 +3,10 @@
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<uses-feature android:name="android.hardware.camera"/> <uses-feature android:name="android.hardware.camera"/>
<uses-permission android:name="android.permission.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"/>
<application <application
android:allowBackup="true" android:allowBackup="true"

9
app/src/main/java/com/example/ueberwachungssystem/MainActivity.java
View File

@ -10,17 +10,20 @@ import androidx.camera.core.ExperimentalGetImage;
import android.Manifest; import android.Manifest;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import android.widget.ToggleButton; import android.widget.ToggleButton;
import android.widget.VideoView;
import com.example.ueberwachungssystem.VideoDetection.VideoDetector; import com.example.ueberwachungssystem.VideoDetection.VideoDetector;
@ExperimentalGetImage @ExperimentalGetImage
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
private static final int CAMERA_PERMISSION_REQUEST_CODE = 101; private static final int CAMERA_PERMISSION_REQUEST_CODE = 100;
private static final int RECORD_VIDEO_PERMISSION_REQUEST_CODE = 102;
@Override @Override
@ -62,9 +65,9 @@ public class MainActivity extends AppCompatActivity {
if (requestCode == CAMERA_PERMISSION_REQUEST_CODE && grantResults.length > 0) { if (requestCode == CAMERA_PERMISSION_REQUEST_CODE && grantResults.length > 0) {
boolean cameraRights = grantResults[0] == PackageManager.PERMISSION_GRANTED; boolean cameraRights = grantResults[0] == PackageManager.PERMISSION_GRANTED;
if (cameraRights) { if (cameraRights) {
Toast.makeText(this, "camera permission granted", Toast.LENGTH_LONG).show(); Toast.makeText(this, "permission granted", Toast.LENGTH_LONG).show();
} else { } else {
Toast.makeText(this, "camera permission denied", Toast.LENGTH_LONG).show(); Toast.makeText(this, "permission denied", Toast.LENGTH_LONG).show();
} }
} }
} }

1
app/src/main/java/com/example/ueberwachungssystem/VideoDetection/VideoDetector.java
View File

@ -117,6 +117,7 @@ public class VideoDetector extends Detector {
if (previewView != null) if (previewView != null)
preview.setSurfaceProvider(previewView.getSurfaceProvider()); preview.setSurfaceProvider(previewView.getSurfaceProvider());
cameraProvider.unbindAll();
cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview); cameraProvider.bindToLifecycle((LifecycleOwner) context, cameraSelector, imageAnalysis, preview);
} }

4
app/src/main/res/layout/activity_main.xml
View File

@ -27,6 +27,8 @@
android:id="@+id/previewView" android:id="@+id/previewView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:backgroundTint="@android:color/black"/> android:backgroundTint="@android:color/black">
</androidx.camera.view.PreviewView>
</LinearLayout> </LinearLayout>