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

Working DetectorService with all Detectors and Recorders

Browse Source
This commit is contained in:
Bastian Kohler 2023-06-21 10:24:45 +02:00
parent 1aea88d08f
commit c730eec9f9
2 changed files with 76 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/java/com/example/ueberwachungssystem/Detection/DetectorService.java
View File

@ -3,17 +3,13 @@ package com.example.ueberwachungssystem.Detection;
import android.content.Intent; import android.content.Intent;
import android.os.Binder; import android.os.Binder;
import android.os.IBinder; import android.os.IBinder;
import android.util.Log;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.camera.core.ExperimentalGetImage; import androidx.camera.core.ExperimentalGetImage;
import androidx.lifecycle.LifecycleService; import androidx.lifecycle.LifecycleService;
import com.example.ueberwachungssystem.WifiCommunication;
import java.io.File; import java.io.File;
@ExperimentalGetImage @ExperimentalGetImage
@ -22,10 +18,11 @@ public class DetectorService extends LifecycleService {
private DetectorService.OnDetectionListener listener; private DetectorService.OnDetectionListener listener;
private boolean isServiceRunning = false; private boolean isServiceRunning = false;
VideoDetector videoDetector = null; // Used Objects:
AudioRecorder audioRecorder = null; public VideoDetector videoDetector = null;
Accelerometer accelerometer = null; public AudioRecorder audioRecorder = null;
MicrophoneDetector microphoneDetector = null; public Accelerometer motionDetector = null;
public MicrophoneDetector audioDetector = null;
@Override @Override
@ -33,6 +30,9 @@ public class DetectorService extends LifecycleService {
if (isServiceRunning) if (isServiceRunning)
return START_NOT_STICKY; return START_NOT_STICKY;
/** Video Detection/Recorder **/ /** Video Detection/Recorder **/
videoDetector = new VideoDetector(this); videoDetector = new VideoDetector(this);
videoDetector.setOnDetectionListener(new Detector.OnDetectionListener() { videoDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
@ -42,17 +42,17 @@ public class DetectorService extends LifecycleService {
} }
}); });
/** Motion Detection**/ /** Motion Detection**/
accelerometer = new Accelerometer(this); motionDetector = new Accelerometer(this);
accelerometer.getSensor(); motionDetector.getSensor();
accelerometer.setOnDetectionListener(new Detector.OnDetectionListener() { motionDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
@Override @Override
public void onDetection(@NonNull DetectionReport detectionReport) { public void onDetection(@NonNull DetectionReport detectionReport) {
passToServiceListener(detectionReport); passToServiceListener(detectionReport);
} }
}); });
/** Audio Detection **/ /** Audio Detection **/
microphoneDetector = new MicrophoneDetector(this); audioDetector = new MicrophoneDetector(this);
microphoneDetector.setOnDetectionListener(new Detector.OnDetectionListener() { audioDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
@Override @Override
public void onDetection(@NonNull DetectionReport detectionReport) { public void onDetection(@NonNull DetectionReport detectionReport) {
passToServiceListener(detectionReport); passToServiceListener(detectionReport);
@ -63,9 +63,13 @@ public class DetectorService extends LifecycleService {
isServiceRunning = true; isServiceRunning = true;
return super.onStartCommand(intent, flags, startId); return super.onStartCommand(intent, flags, startId);
} }
@Override @Override
public void onDestroy() { public void onDestroy() {
super.onDestroy(); super.onDestroy();
@ -108,22 +112,22 @@ public class DetectorService extends LifecycleService {
/** Audio Detection */ /** Audio Detection */
public void startAudioDetection() { public void startAudioDetection() {
if(microphoneDetector != null) if(audioDetector != null)
microphoneDetector.startDetection(); audioDetector.startDetection();
} }
public void stopAudioDetection() { public void stopAudioDetection() {
if(microphoneDetector != null) if(audioDetector != null)
microphoneDetector.stopDetection(); audioDetector.stopDetection();
} }
/** Motion Detection */ /** Motion Detection */
public void startMotionDetection() { public void startMotionDetection() {
if(accelerometer != null) if(motionDetector != null)
accelerometer.startDetection(); motionDetector.startDetection();
} }
public void stopMotionDetection() { public void stopMotionDetection() {
if(accelerometer != null) if(motionDetector != null)
accelerometer.stopDetection(); motionDetector.stopDetection();
} }
/** Video Recording */ /** Video Recording */
@ -165,7 +169,7 @@ public class DetectorService extends LifecycleService {
} }
/** pass Detection Report to Service Detection Listener and trigger it */ /** Pass Detection Report to Service Detection Listener and trigger it */
public void passToServiceListener(DetectionReport detectionReport) { public void passToServiceListener(DetectionReport detectionReport) {
if (listener != null) { if (listener != null) {
listener.onDetection(detectionReport); listener.onDetection(detectionReport);

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

@ -5,7 +5,12 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.camera.core.ExperimentalGetImage; import androidx.camera.core.ExperimentalGetImage;
import androidx.camera.view.PreviewView; import androidx.camera.view.PreviewView;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
@ -15,77 +20,61 @@ import com.example.ueberwachungssystem.Detection.Accelerometer;
import com.example.ueberwachungssystem.Detection.AudioRecorder; import com.example.ueberwachungssystem.Detection.AudioRecorder;
import com.example.ueberwachungssystem.Detection.DetectionReport; import com.example.ueberwachungssystem.Detection.DetectionReport;
import com.example.ueberwachungssystem.Detection.Detector; import com.example.ueberwachungssystem.Detection.Detector;
import com.example.ueberwachungssystem.Detection.DetectorService;
import com.example.ueberwachungssystem.Detection.MicrophoneDetector; import com.example.ueberwachungssystem.Detection.MicrophoneDetector;
import com.example.ueberwachungssystem.Detection.VideoDetector; import com.example.ueberwachungssystem.Detection.VideoDetector;
@ExperimentalGetImage @ExperimentalGetImage
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
private DetectorService detectorService = new DetectorService();
ImageView inputImageView;
ImageView outputImageView;
ToggleButton toggleButton;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
ImageView inputImageView = findViewById(R.id.inputImageView); inputImageView = findViewById(R.id.inputImageView);
ImageView outputImageView = findViewById(R.id.outputImageView); outputImageView = findViewById(R.id.outputImageView);
PreviewView previewView = findViewById(R.id.previewView); toggleButton = findViewById(R.id.toggleButton);
PermissionHandler permissionHandler = new PermissionHandler(this); PermissionHandler permissionHandler = new PermissionHandler(this);
permissionHandler.getPermissions(); permissionHandler.getPermissions();
if (permissionHandler.hasPermissions()) { if (permissionHandler.hasPermissions()) {
AudioRecorder audioRecorder = new AudioRecorder(this);
VideoDetector vd = new VideoDetector(this);
//vd.debugProcessing(inputImageView, outputImageView);
vd.setOnDetectionListener(new Detector.OnDetectionListener() {
@Override
public void onDetection(@NonNull DetectionReport detectionReport) {
Log.d("onDetection", detectionReport.toString());
}
});
MicrophoneDetector microphoneDetector = new MicrophoneDetector(this);
microphoneDetector.setOnDetectionListener(new Detector.OnDetectionListener() {
@Override
public void onDetection(@NonNull DetectionReport detectionReport) {
Log.d("onDetection", detectionReport.toString());
}
});
Accelerometer accelerometer = new Accelerometer(this);
accelerometer.getSensor();
accelerometer.setOnDetectionListener(new Detector.OnDetectionListener() {
@Override
public void onDetection(@NonNull DetectionReport detectionReport) {
Log.d("onDetection", detectionReport.toString());
}
});
ToggleButton toggleButton = findViewById(R.id.toggleButton); Intent serviceIntent = new Intent(this, DetectorService.class);
bindService(serviceIntent, serviceConnection, Context.BIND_AUTO_CREATE);
startService(serviceIntent);
toggleButton.setOnClickListener(new View.OnClickListener() { toggleButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (toggleButton.isChecked()) if (toggleButton.isChecked())
{ {
//vd.startDetection(); if (detectorService != null){
//vd.stopDetection();
vd.startDetection();
microphoneDetector.startDetection();
accelerometer.startDetection();
vd.startRecording(); detectorService.debugVideoProcessing(inputImageView, outputImageView);
audioRecorder.startRecording(); detectorService.startVideoDetection();
detectorService.startAudioDetection();
detectorService.startMotionDetection();
detectorService.startVideoRecording();
detectorService.startAudioRecording();
}
} }
else { else {
//vd.stopDetection(); detectorService.stopVideoDetection();
vd.stopRecording(); detectorService.stopAudioDetection();
audioRecorder.stopRecording(); detectorService.stopMotionDetection();
detectorService.stopVideoRecording();
detectorService.stopAudioRecording();
} }
} }
}); });
@ -97,6 +86,22 @@ public class MainActivity extends AppCompatActivity {
} }
} }
private ServiceConnection serviceConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
DetectorService.ServiceBinder binder = (DetectorService.ServiceBinder) service;
detectorService = binder.getBoundService();
detectorService.setOnDetectionListener(new DetectorService.OnDetectionListener() {
@Override
public void onDetection(@NonNull DetectionReport detectionReport) {
Log.d("onDetection", detectionReport.toString());
}
});
}
@Override
public void onServiceDisconnected(ComponentName name) {}
};
} }