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

Removed DetectorService methods and added public classes

Browse Source
This commit is contained in:
Bastian Kohler 2023-06-21 10:49:18 +02:00
parent c730eec9f9
commit 3b88a140cc
2 changed files with 18 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,84 +91,6 @@ public class DetectorService extends LifecycleService {
} }
/** Video Detection */
public void startVideoDetection() {
if(videoDetector != null)
videoDetector.startDetection();
}
public void stopVideoDetection() {
if(videoDetector != null)
videoDetector.stopDetection();
}
public boolean isVideoDetectionRunning() {
if(videoDetector != null)
return videoDetector.isDetecting();
return false;
}
public void debugVideoProcessing(ImageView input, ImageView output) {
if(videoDetector != null)
videoDetector.debugProcessing(input, output);
}
/** Audio Detection */
public void startAudioDetection() {
if(audioDetector != null)
audioDetector.startDetection();
}
public void stopAudioDetection() {
if(audioDetector != null)
audioDetector.stopDetection();
}
/** Motion Detection */
public void startMotionDetection() {
if(motionDetector != null)
motionDetector.startDetection();
}
public void stopMotionDetection() {
if(motionDetector != null)
motionDetector.stopDetection();
}
/** Video Recording */
public void startVideoRecording() {
if(videoDetector != null)
videoDetector.startRecording();
}
public void stopVideoRecording() {
if(videoDetector != null)
videoDetector.stopRecording();
}
public boolean isVideoRecordingRunning() {
if(videoDetector != null)
return videoDetector.isRecording();
return false;
}
public void setVideoRecordingDir(File outputDir) {
if (videoDetector != null)
videoDetector.setOutputDir(outputDir);
}
/** Audio Recording */
public void startAudioRecording() {
if(audioRecorder != null)
audioRecorder.startRecording();
}
public void stopAudioRecording() {
if(audioRecorder != null)
audioRecorder.stopRecording();
}
public boolean isAudioRecordingRunning() {
if(videoDetector != null)
return audioRecorder.isRecording();
return false;
}
public void setAudioRecordingDir(File outputDir) {
if (audioRecorder != null)
audioRecorder.setOutputDir(outputDir);
}
/** 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) {

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

@ -60,21 +60,28 @@ public class MainActivity extends AppCompatActivity {
{ {
if (detectorService != null){ if (detectorService != null){
detectorService.debugVideoProcessing(inputImageView, outputImageView); detectorService.videoDetector.debugProcessing(inputImageView, outputImageView);
detectorService.startVideoDetection(); detectorService.videoDetector.startDetection();
detectorService.startAudioDetection();
detectorService.startMotionDetection();
detectorService.startVideoRecording();
detectorService.startAudioRecording();
detectorService.audioDetector.startDetection();
detectorService.motionDetector.startDetection();
detectorService.audioRecorder.stopRecording();
detectorService.videoDetector.startRecording();
} }
} }
else { else {
detectorService.stopVideoDetection(); detectorService.videoDetector.stopDetection();
detectorService.stopAudioDetection();
detectorService.stopMotionDetection(); detectorService.audioDetector.stopDetection();
detectorService.stopVideoRecording();
detectorService.stopAudioRecording(); detectorService.motionDetector.stopDetection();
detectorService.audioRecorder.stopRecording();
detectorService.videoDetector.stopRecording();
} }
} }
}); });